diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2012-08-14 11:00:14 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-08-16 18:08:03 -0400 |
| commit | 732470a3594351ffc3d085a755271844c462e9c8 (patch) | |
| tree | e2e59e056a97bf29ee2b680019f722dbdc785319 /gio/gfile.c | |
| parent | b60168a5f5b4bcfa8f8ed175cd18a0cfaea96063 (diff) | |
| download | glib-732470a3594351ffc3d085a755271844c462e9c8.tar.gz glib-732470a3594351ffc3d085a755271844c462e9c8.tar.bz2 glib-732470a3594351ffc3d085a755271844c462e9c8.zip | |
g_file_make_directory_with_parents: refix error propagation
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
Diffstat (limited to 'gio/gfile.c')
| -rw-r--r-- | gio/gfile.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gio/gfile.c b/gio/gfile.c index 3bdae74c1..68207acb6 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -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); } |