X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssparser.c;h=ab38fc9d93560a279dc025aeb925ff48b7c3c3f0;hb=cade42d5094ceaa7799aa8e2135959573646a4b6;hp=04242aaa7163535b1adb752ae30092710fc8f9e1;hpb=c69e30d65a314105288c29bcb2b94d3b97920701;p=~andy%2Fgtk diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c index 04242aaa7..ab38fc9d9 100644 --- a/gtk/gtkcssparser.c +++ b/gtk/gtkcssparser.c @@ -257,7 +257,7 @@ gtk_css_parser_skip_comment (GtkCssParser *parser) parser->data++; - if (parser->data[-2] == '*') + if (len > 0 && parser->data[-2] == '*') return TRUE; if (parser->data[0] == '*') _gtk_css_parser_error (parser, "'/*' in comment block"); @@ -885,11 +885,11 @@ _gtk_css_parser_read_url (GtkCssParser *parser) return file; } -void -_gtk_css_parser_resync_internal (GtkCssParser *parser, - gboolean sync_at_semicolon, - gboolean read_sync_token, - char terminator) +static void +gtk_css_parser_resync_internal (GtkCssParser *parser, + gboolean sync_at_semicolon, + gboolean read_sync_token, + char terminator) { gsize len; @@ -984,7 +984,7 @@ _gtk_css_parser_read_value (GtkCssParser *parser) start = parser->data; /* This needs to be done better */ - _gtk_css_parser_resync_internal (parser, TRUE, FALSE, '}'); + gtk_css_parser_resync_internal (parser, TRUE, FALSE, '}'); result = g_strndup (start, parser->data - start); if (result) @@ -1010,5 +1010,5 @@ _gtk_css_parser_resync (GtkCssParser *parser, { g_return_if_fail (GTK_IS_CSS_PARSER (parser)); - _gtk_css_parser_resync_internal (parser, sync_at_semicolon, TRUE, terminator); + gtk_css_parser_resync_internal (parser, sync_at_semicolon, TRUE, terminator); }