luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-06 11:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-4677-4678-display-name-leaks-glib-2-84' into 'glib-2-84'

Browse Source 
Backport !4677 and !4678 “Fix GFile leak in g_local_file_set_display_name()” to glib-2-84

See merge request GNOME/glib!4679
This commit is contained in:
Michael Catanzaro
2025-07-07 08:12:21 -05:00
parent b9c66f4fae e519e5489d
commit ba54be80f4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/glocalfile.c
View File

@@ -1189,6 +1189,7 @@ g_local_file_set_display_name (GFile *file,
if (errsv != ENOENT) if (errsv != ENOENT)
{ {
g_set_io_error (error, _("Error renaming file %s: %s"), new_file, errsv); g_set_io_error (error, _("Error renaming file %s: %s"), new_file, errsv);
g_object_unref (new_file);
return NULL; return NULL;
} }
} }
@@ -1196,6 +1197,7 @@ g_local_file_set_display_name (GFile *file,
{ {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
_("Can’t rename file, filename already exists")); _("Can’t rename file, filename already exists"));
g_object_unref (new_file);
return NULL; return NULL;
} }