isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Canonicalize URLs in stylesheets

Browse Source 
Make _st_theme_resolve_url() a bit smarter by canonicalizing the
resulting path (e.g. resolving references to /./ and /../).

https://bugzilla.gnome.org/show_bug.cgi?id=679268
This commit is contained in:
Florian Müllner 2012-10-17 22:28:01 +02:00
parent 0ea8217c55
commit 15273c7f22
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/st/st-theme.c
View File

@ -1018,6 +1018,7 @@ _st_theme_resolve_url (StTheme *theme,
const char *base_filename = NULL; const char *base_filename = NULL;
char *dirname; char *dirname;
char *filename; char *filename;
char *canonicalized_path;
/* Handle absolute file:/ URLs */ /* Handle absolute file:/ URLs */
if (g_str_has_prefix (url, "file:") || if (g_str_has_prefix (url, "file:") ||
@ -1050,7 +1051,19 @@ _st_theme_resolve_url (StTheme *theme,
/* Assume anything else is a relative URL, and "resolve" it /* Assume anything else is a relative URL, and "resolve" it
*/ */
if (url[0] == '/') if (url[0] == '/')
return g_strdup (url); {
canonicalized_path = realpath (url, NULL);
if (g_mem_is_system_malloc ())
{
filename = canonicalized_path;
}
else
{
filename = g_strdup (canonicalized_path);
free (canonicalized_path);
}
return filename;
}
base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet); base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet);
@ -1062,7 +1075,19 @@ _st_theme_resolve_url (StTheme *theme,
dirname = g_path_get_dirname (base_filename); dirname = g_path_get_dirname (base_filename);
filename = g_build_filename (dirname, url, NULL); filename = g_build_filename (dirname, url, NULL);
canonicalized_path = realpath (filename, NULL);
g_free (dirname); g_free (dirname);
g_free (filename);
if (g_mem_is_system_malloc ())
{
filename = canonicalized_path;
}
else
{
filename = g_strdup (canonicalized_path);
free (canonicalized_path);
}
return filename; return filename;
} }