gvfs r1499 - in trunk: . daemon

[hadess svn gnome org]

Author: hadess
Date: Mon Mar  3 11:20:55 2008
New Revision: 1499
URL: http://svn.gnome.org/viewvc/gvfs?rev=1499&view=rev

Log:
2008-03-03  Bastien Nocera  <hadess hadess net>

	* daemon/gvfsbackendobexftp.c (do_mount), (do_open_for_read),
	(do_read), (do_query_info), (do_query_fs_info), (do_enumerate),
	(do_delete), (do_make_directory): Fix a crasher when
	mounting fails, by not freeing the error just before using it
	(duh!) (Closes: #519752), Fix a few error paths leaking errors



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

Modified: trunk/daemon/gvfsbackendobexftp.c
==============================================================================
--- trunk/daemon/gvfsbackendobexftp.c	(original)
+++ trunk/daemon/gvfsbackendobexftp.c	Mon Mar  3 11:20:55 2008
@@ -612,8 +612,8 @@
                          DBUS_TYPE_G_OBJECT_PATH, &path, G_TYPE_INVALID) == FALSE)
     {
       g_free (bdaddr);
-      g_error_free (error);
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      g_error_free (error);
       return;
     }
 
@@ -1081,6 +1081,7 @@
     {
       g_mutex_unlock (op_backend->mutex);
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      g_error_free (error);
       ovu_caps_free (caps);
       return;
     }
@@ -1206,6 +1207,7 @@
     {
       g_mutex_unlock (op_backend->mutex);
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      g_error_free (error);
       g_object_unref (info);
       return;
     }
@@ -1374,6 +1376,7 @@
     {
       g_mutex_unlock (op_backend->mutex);
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
+      g_error_free (error);
       return;
     }