luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 01:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 547080 – g_file_copy leaks expected errors

Browse Source 
* gfile.c: (g_file_copy): Clear G_IO_ERROR_NOT_SUPPORTED errors
        before trying the next fallback routine.


svn path=/branches/glib-2-16/; revision=7466
This commit is contained in:
Matthias Clasen
2008-09-11 19:07:35 +00:00
parent 45151f5d40
commit 62b42594db
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gio/ChangeLog
View File

@@ -1,3 +1,13 @@
2008-09-11 Matthias Clasen <mclasen@redhat.com>
Merge from trunk
Bug 547080 – g_file_copy leaks expected errors
* gfile.c: (g_file_copy): Clear G_IO_ERROR_NOT_SUPPORTED
errors before trying the next fallback routine. Patch by
Felix Riemann
2008-09-11 Matthias Clasen <mclasen@redhat.com> 2008-09-11 Matthias Clasen <mclasen@redhat.com>
Merge from trunk Merge from trunk

4
gio/gfile.c
View File

@@ -2381,6 +2381,8 @@ g_file_copy (GFile *source,
g_propagate_error (error, my_error); g_propagate_error (error, my_error);
return FALSE; return FALSE;
} }
else
g_clear_error (&my_error);
} }
/* If the types are different, and the destination method failed /* If the types are different, and the destination method failed
@@ -2405,6 +2407,8 @@ g_file_copy (GFile *source,
g_propagate_error (error, my_error); g_propagate_error (error, my_error);
return FALSE; return FALSE;
} }
else
g_clear_error (&my_error);
} }
} }