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

gutils: Move the special case default value for G_USER_DIRECTORY_DESKTOP

Browse Source 
Otherwise it isn’t set on every code path, and it’s possible for a
caller to receive `NULL` when they call `g_get_user_special_dir
(G_USER_DIRECTORY_DESKTOP)`, i.e. after calling
`g_reload_user_special_dirs_cache()`.

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

26
glib/gutils.c
View File

@@ -2279,21 +2279,20 @@ load_user_special_dirs_unlocked (void)
const gchar *config_dir = NULL; const gchar *config_dir = NULL;
const gchar *home_dir; const gchar *home_dir;
gchar *config_file; gchar *config_file;
gchar *data; char *data = NULL;
config_dir = g_get_user_config_dir_unlocked (); config_dir = g_get_user_config_dir_unlocked ();
config_file = g_build_filename (config_dir, config_file = g_build_filename (config_dir,
"user-dirs.dirs", "user-dirs.dirs",
NULL); NULL);
if (!g_file_get_contents (config_file, &data, NULL, NULL))
{
g_free (config_file);
return;
}
home_dir = g_get_home_dir_unlocked (); home_dir = g_get_home_dir_unlocked ();
load_user_special_dirs_from_string (data, home_dir, g_user_special_dirs);
if (g_file_get_contents (config_file, &data, NULL, NULL))
load_user_special_dirs_from_string (data, home_dir, g_user_special_dirs);
/* Special-case desktop for historical compatibility */
if (g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] == NULL)
g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_build_filename (home_dir, "Desktop", NULL);
g_free (data); g_free (data);
g_free (config_file); g_free (config_file);
@@ -2392,16 +2391,7 @@ g_get_user_special_dir (GUserDirectory directory)
if (G_UNLIKELY (g_user_special_dirs == NULL)) if (G_UNLIKELY (g_user_special_dirs == NULL))
{ {
g_user_special_dirs = g_new0 (gchar *, G_USER_N_DIRECTORIES); g_user_special_dirs = g_new0 (gchar *, G_USER_N_DIRECTORIES);
load_user_special_dirs_unlocked (); load_user_special_dirs_unlocked ();
/* Special-case desktop for historical compatibility */
if (g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] == NULL)
{
gchar *home_dir = g_build_home_dir ();
g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_build_filename (home_dir, "Desktop", NULL);
g_free (home_dir);
}
} }
user_special_dir = g_user_special_dirs[directory]; user_special_dir = g_user_special_dirs[directory];