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

glib: fix g_reload_user_special_dirs_cache

Browse Source 
We handle a special case for G_USER_DIRECTORY_DESKTOP
when we init the values but drop it when we reload them.
Fix this by preferring old values to NULL

https://bugzilla.gnome.org/show_bug.cgi?id=676594

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2012-05-22 21:56:10 +02:00
parent 2e31166f6a
commit ce5bd68e26
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gutils.c
View File

@ -1731,14 +1731,18 @@ g_reload_user_special_dirs_cache (void)
/* only leak changed directories */ /* only leak changed directories */
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_strcmp0 (old_val, g_user_special_dirs[i]) == 0) if (g_user_special_dirs[i] == NULL)
{ {
/* don't leak */ g_user_special_dirs[i] = old_val;
g_free (g_user_special_dirs[i]);
g_user_special_dirs[i] = old_val;
} }
else else if (g_strcmp0 (old_val, g_user_special_dirs[i]) == 0)
{
/* don't leak */
g_free (g_user_special_dirs[i]);
g_user_special_dirs[i] = old_val;
}
else
g_free (old_val); g_free (old_val);
} }