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

gutils: Fix deliberate-leak code in g_reload_user_special_dirs_cache()

Browse Source 
It seems it wasn’t behaving as advertised: it was freeing all the old
string values unless they were strcmp-equal to the new ones, in which
case the new ones were discarded.

What’s actually documented is that the old values are always leaked,
unless they’re strcmp-equal to the new ones.

Adjust the code to match the documentation. A unit test will be added in
a following commit.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall
2025-09-19 13:25:53 +01:00
parent e4c2b08218
commit ab09a3e933
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gutils.c
View File

@@ -2337,18 +2337,18 @@ g_reload_user_special_dirs_cache (void)
for (i = 0; i < G_USER_N_DIRECTORIES; i++) for (i = 0; i < G_USER_N_DIRECTORIES; i++)
{ {
old_val = old_g_user_special_dirs[i]; old_val = old_g_user_special_dirs[i];
if (g_user_special_dirs[i] == NULL)
if (g_user_special_dirs[i] == NULL ||
g_strcmp0 (old_val, g_user_special_dirs[i]) != 0)
{ {
g_user_special_dirs[i] = old_val; g_ignore_leak (old_val);
} }
else if (g_strcmp0 (old_val, g_user_special_dirs[i]) == 0) else
{ {
/* don't leak */ /* don't leak */
g_free (g_user_special_dirs[i]); g_free (g_user_special_dirs[i]);
g_user_special_dirs[i] = old_val; g_user_special_dirs[i] = old_val;
} }
else
g_free (old_val);
} }
/* free the old array */ /* free the old array */