summaryrefslogtreecommitdiff
path: root/gtk/gtkcsscolorvalue.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2013-03-28 22:52:30 +0100
committerBenjamin Otte <otte@redhat.com>2013-03-28 23:18:59 +0100
commitc25d8e3aea900f8ae2abd2907a5b8a2e89e7ee9e (patch)
treea2e9aa610dbc3ec5b01074bc97d640b76efddfa8 /gtk/gtkcsscolorvalue.c
parentdded6a0673100f1d0512366d71a2a333252f0a49 (diff)
downloadgtk+-c25d8e3aea900f8ae2abd2907a5b8a2e89e7ee9e.tar.gz
cssvalue: Handle named colors not resolving
If a named color references a nonexistant named color, we didn't catch that error and ended up crashing on a NULL-dereference. This crashed Boxes, because its CSS referenced values from the theme that didn't exist in any theme.
Diffstat (limited to 'gtk/gtkcsscolorvalue.c')
-rw-r--r--gtk/gtkcsscolorvalue.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c
index 9ff0a05210..64933bde58 100644
--- a/gtk/gtkcsscolorvalue.c
+++ b/gtk/gtkcsscolorvalue.c
@@ -166,6 +166,8 @@ _gtk_css_color_value_resolve (GtkCssValue *color,
return NULL;
value = _gtk_css_color_value_resolve (named, provider, current, current_deps, dependencies);
+ if (value == NULL)
+ return NULL;
}
break;