luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

glocalfile: Trash, free values when done avoiding leaks on early returns

Browse Source 
In glocalfile we're allocating some temporary strings but we don't free
them on early returns, so free them once done and unset the variables
to prevent them being used incorrectly.
This commit is contained in:
Marco Trevisan (Treviño) 2024-05-08 22:59:44 +02:00
parent 365411ea32
commit ddfc8e2918
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/glocalfile.c
View File

@ -2284,6 +2284,7 @@ g_local_file_trash (GFile *file,
data = g_strdup_printf ("[Trash Info]\nPath=%s\nDeletionDate=%s\n", data = g_strdup_printf ("[Trash Info]\nPath=%s\nDeletionDate=%s\n",
original_name_escaped, delete_time); original_name_escaped, delete_time);
g_free (delete_time); g_free (delete_time);
g_clear_pointer (&original_name_escaped, g_free);
if (!g_file_set_contents_full (infofile, data, -1, if (!g_file_set_contents_full (infofile, data, -1,
G_FILE_SET_CONTENTS_CONSISTENT | G_FILE_SET_CONTENTS_ONLY_EXISTING, G_FILE_SET_CONTENTS_CONSISTENT | G_FILE_SET_CONTENTS_ONLY_EXISTING,
@ -2291,6 +2292,7 @@ g_local_file_trash (GFile *file,
{ {
g_unlink (infofile); g_unlink (infofile);
g_free (data);
g_free (filesdir); g_free (filesdir);
g_free (trashname); g_free (trashname);
g_free (infofile); g_free (infofile);
@ -2298,6 +2300,8 @@ g_local_file_trash (GFile *file,
return FALSE; return FALSE;
} }
g_clear_pointer (&data, g_free);
/* TODO: Maybe we should verify that you can delete the file from the trash /* TODO: Maybe we should verify that you can delete the file from the trash
* before moving it? OTOH, that is hard, as it needs a recursive scan * before moving it? OTOH, that is hard, as it needs a recursive scan
*/ */
@ -2341,9 +2345,6 @@ g_local_file_trash (GFile *file,
/* TODO: Do we need to update mtime/atime here after the move? */ /* TODO: Do we need to update mtime/atime here after the move? */
g_free (infofile); g_free (infofile);
g_free (data);
g_free (original_name_escaped);
g_free (trashname); g_free (trashname);
return TRUE; return TRUE;