gvfs r2316 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Tue Mar 10 15:57:26 2009
New Revision: 2316
URL: http://svn.gnome.org/viewvc/gvfs?rev=2316&view=rev

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

	Bug 574754 â 100% cpu usage when connecting to a ssh key and denying key access

	* daemon/gvfsbackendsftp.c (read_reply_sync):
	Make sure we handle ssh exiting early.




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

Modified: trunk/daemon/gvfsbackendsftp.c
==============================================================================
--- trunk/daemon/gvfsbackendsftp.c	(original)
+++ trunk/daemon/gvfsbackendsftp.c	Tue Mar 10 15:57:26 2009
@@ -560,6 +560,15 @@
 				&bytes_read, NULL, error))
     return NULL;
 
+  /* Make sure we handle ssh exiting early, e.g. if no further
+     authentication methods */
+  if (bytes_read == 0)
+    {
+      g_set_error_literal (error,
+			   G_IO_ERROR, G_IO_ERROR_FAILED,
+			   _("ssh program unexpectedly exited"));
+      return NULL;
+    }
   
   len = GUINT32_FROM_BE (len);