callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssprovider: Add recursion checks for @import

Browse Source 
This is pretty important, because otherwise recursions cause crashes.
And if you accidentally change your theme to one that crashes on load,
all your gonna SEGV and then on reboot, gdm tries to load the theme...
This commit is contained in:
Benjamin Otte 2011-04-12 02:50:25 +02:00
parent 22492a37c1
commit 6b66efe873
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkcssprovider.c
View File

@ -1238,6 +1238,23 @@ gtk_css_scanner_get_base_url (GScanner *scanner)
return priv->base;
}
static gboolean
gtk_css_scanner_would_recurse (GScanner *scanner,
GFile *file)
{
while (scanner)
{
GtkCssScannerPrivate *priv = scanner->user_data;
if (priv->file && g_file_equal (priv->file, file))
return TRUE;
scanner = priv->parent;
}
return FALSE;
}
static void
gtk_css_provider_init (GtkCssProvider *css_provider)
{
@ -2282,12 +2299,25 @@ parse_rule (GtkCssProvider *css_provider,
return ';';
}
/* FIXME: Avoid recursive importing */
gtk_css_provider_load_internal (css_provider,
scanner,
actual,
NULL, 0,
NULL);
if (gtk_css_scanner_would_recurse (scanner, actual))
{
char *path = g_file_get_path (actual);
gtk_css_provider_error (css_provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_IMPORT,
"Loading '%s' would recurse",
path);
g_free (path);
}
else
{
gtk_css_provider_load_internal (css_provider,
scanner,
actual,
NULL, 0,
NULL);
}
g_object_unref (actual);