g_file_make_directory_with_parents: refix error propagation
authorOwen W. Taylor <otaylor@fishsoup.net>
Tue, 14 Aug 2012 15:00:14 +0000 (11:00 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 16 Aug 2012 22:08:03 +0000 (18:08 -0400)
The patch from b0bce4ad triggered segfaults - see:

 http://redmine.yorba.org/issues/5656

We were clearing the error before dereferencing it in the next
go-around of the while loop - this wasn't necessary.

https://bugzilla.gnome.org/show_bug.cgi?id=680823

gio/gfile.c

index 3bdae74..68207ac 100644 (file)
@@ -3395,10 +3395,7 @@ g_file_make_directory_with_parents (GFile         *file,
       work_file = g_object_ref (parent_file);
 
       if (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
-        {
-          g_clear_error (&my_error);
-          list = g_list_prepend (list, parent_file);  /* Transfer ownership of ref */
-        }
+        list = g_list_prepend (list, parent_file);  /* Transfer ownership of ref */
       else
         g_object_unref (parent_file);
     }