gvfs r2266 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Mar  2 10:21:58 2009
New Revision: 2266
URL: http://svn.gnome.org/viewvc/gvfs?rev=2266&view=rev

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

        Bug 569203 â gvfsd-sftp crashed with SIGSEGV in strlen()

        * daemon/gvfsbackendsftp.c:
        Workaround crash, spew a warning to try to get information about this crash.




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

Modified: trunk/daemon/gvfsbackendsftp.c
==============================================================================
--- trunk/daemon/gvfsbackendsftp.c	(original)
+++ trunk/daemon/gvfsbackendsftp.c	Mon Mar  2 10:21:58 2009
@@ -903,7 +903,18 @@
 	    {
 	      g_free (new_user);
 	    }
-          
+
+	  if (new_password == NULL)
+	    {
+	      /* This really should not happen, but was seen as bug #569203
+	       * avoid crash and ask for info
+	       */
+	      g_warning ("Got NULL password but no error in sftp login request. "
+			 "This should not happen, if you can reproduce this, please "
+			 "add information to http://bugzilla.gnome.org/show_bug.cgi?id=569203";);
+	      new_password = g_strdup ("");
+	    }
+	  
           if (!g_output_stream_write_all (reply_stream,
                                           new_password, strlen (new_password),
                                           &bytes_written,