colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

base-dirs: ensure we skip non-absolute paths in the XDG env variables

Browse Source 
The XDG basedir spec explicitly says non-absolute paths must be ignored
and the glib wraper functions don't check that.
This commit is contained in:
George Kiagiadakis
2024-03-01 13:08:23 +02:00
parent a873f47d2e
commit 8040967e47
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/wp/base-dirs.c
View File

@@ -88,16 +88,19 @@ lookup_dirs (guint flags, gboolean is_absolute)
else {
if (flags & WP_BASE_DIRS_XDG_CONFIG_HOME) {
dir = g_get_user_config_dir ();
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, dir));
if (G_LIKELY (g_path_is_absolute (dir)))
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, dir));
}
if (flags & WP_BASE_DIRS_XDG_DATA_HOME) {
dir = g_get_user_data_dir ();
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, dir));
if (G_LIKELY (g_path_is_absolute (dir)))
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, dir));
}
if (flags & WP_BASE_DIRS_XDG_CONFIG_DIRS) {
const gchar * const *xdg_dirs = g_get_system_config_dirs ();
for (guint i = 0; xdg_dirs[i]; i++) {
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, xdg_dirs[i]));
if (G_LIKELY (g_path_is_absolute (xdg_dirs[i])))
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, xdg_dirs[i]));
}
}
if (flags & WP_BASE_DIRS_BUILD_SYSCONFDIR) {
@@ -106,7 +109,8 @@ lookup_dirs (guint flags, gboolean is_absolute)
if (flags & WP_BASE_DIRS_XDG_DATA_DIRS) {
const gchar * const *xdg_dirs = g_get_system_data_dirs ();
for (guint i = 0; xdg_dirs[i]; i++) {
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, xdg_dirs[i]));
if (G_LIKELY (g_path_is_absolute (xdg_dirs[i])))
g_ptr_array_add (dirs, g_canonicalize_filename (subdir, xdg_dirs[i]));
}
}
if (flags & WP_BASE_DIRS_BUILD_DATADIR) {