gvfs r2361 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Thu Apr  2 17:04:48 2009
New Revision: 2361
URL: http://svn.gnome.org/viewvc/gvfs?rev=2361&view=rev

Log:
2009-04-02  Alexander Larsson  <alexl redhat com>

	Bug 577748 â gvfsd-smb crash after unconnecting and connecting again a smb share
	
	* daemon/gvfsbackendsmb.c (set_info_from_stat):
	Don't crash if basename is NULL




Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendsmb.c

Modified: trunk/daemon/gvfsbackendsmb.c
==============================================================================
--- trunk/daemon/gvfsbackendsmb.c	(original)
+++ trunk/daemon/gvfsbackendsmb.c	Thu Apr  2 17:04:48 2009
@@ -1474,15 +1474,17 @@
 					G_FILE_ATTRIBUTE_STANDARD_ICON))
     {
       icon = NULL;
+      content_type = NULL;
+      
       if (S_ISDIR(statbuf->st_mode))
 	{
 	  content_type = g_strdup ("inode/directory");
-	  if (strcmp (basename, "/") == 0)
+	  if (basename != NULL && strcmp (basename, "/") == 0)
 	    icon = g_themed_icon_new ("folder-remote");
 	  else
 	    icon = g_themed_icon_new ("folder");
 	}
-      else
+      else if (basename != NULL)
 	{
 	  content_type = g_content_type_guess (basename, NULL, 0, NULL);
 	  if (content_type)