summaryrefslogtreecommitdiff
path: root/gtk/gtkcsscolorvalueprivate.h
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2013-03-28 23:13:43 +0100
committerBenjamin Otte <otte@redhat.com>2013-03-28 23:18:59 +0100
commitcbee3901486781370f50ee02f49bdbd463f3eaa3 (patch)
tree1fa0753468338560bed086dcfd77b69535c22ca8 /gtk/gtkcsscolorvalueprivate.h
parentc25d8e3aea900f8ae2abd2907a5b8a2e89e7ee9e (diff)
downloadgtk+-cbee3901486781370f50ee02f49bdbd463f3eaa3.tar.gz
cssvalue: At cycle detection to color resolving
The following CSS would infloop: @define-color self @self as it would infinitely lookup the color named "self" and try to resolve it. This patch adds detection of such cycles to the resolve function by keeping a list of currently resolving colors in the cycle_list variable.
Diffstat (limited to 'gtk/gtkcsscolorvalueprivate.h')
-rw-r--r--gtk/gtkcsscolorvalueprivate.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkcsscolorvalueprivate.h b/gtk/gtkcsscolorvalueprivate.h
index 06e6a1cd0e..4392a0799d 100644
--- a/gtk/gtkcsscolorvalueprivate.h
+++ b/gtk/gtkcsscolorvalueprivate.h
@@ -47,7 +47,8 @@ GtkCssValue * _gtk_css_color_value_resolve (GtkCssValue
GtkStyleProviderPrivate *provider,
GtkCssValue *current,
GtkCssDependencies current_deps,
- GtkCssDependencies *dependencies);
+ GtkCssDependencies *dependencies,
+ GSList *cycle_list);
G_END_DECLS