From 3cd6edeba849024c55c6ecff6b0c7c58587294de Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Fri, 11 May 2012 20:46:18 -0400 Subject: [PATCH] csspositionvalue: make empty error value non fatal If there's just no value to parse (e.g. because we're parsing a shorthand property), don't error out while trying to parse a number. --- gtk/gtkcsspositionvalue.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gtk/gtkcsspositionvalue.c b/gtk/gtkcsspositionvalue.c index 61c34f3162..fd230ed917 100644 --- a/gtk/gtkcsspositionvalue.c +++ b/gtk/gtkcsspositionvalue.c @@ -187,12 +187,18 @@ _gtk_css_position_value_parse (GtkCssParser *parser) } if (names[first].name == NULL) { - missing = &y; - x = _gtk_css_number_value_parse (parser, - GTK_CSS_PARSE_PERCENT - | GTK_CSS_PARSE_LENGTH); - if (x == NULL) - return NULL; + if (_gtk_css_parser_has_number (parser)) + { + missing = &y; + x = _gtk_css_number_value_parse (parser, + GTK_CSS_PARSE_PERCENT + | GTK_CSS_PARSE_LENGTH); + + if (x == NULL) + return NULL; + } + else + return NULL; } for (second = 0; names[second].name != NULL; second++)