summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-06-27 19:01:31 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-06-27 19:01:31 +0000
commitb34a0e55fc302f4efd8f969ea2a04b1760d97858 (patch)
tree51bb6c4d75b72be3c833256bfbdedc1e709183ef
parent5a65b0ca5d9a230c845924e14924ffcc43c13c5b (diff)
downloadlibcss-b34a0e55fc302f4efd8f969ea2a04b1760d97858.tar.gz
libcss-b34a0e55fc302f4efd8f969ea2a04b1760d97858.tar.bz2
Fix list-style shorthand parser
svn path=/trunk/libcss/; revision=8073
-rw-r--r--src/parse/properties/generated_list.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/parse/properties/generated_list.c b/src/parse/properties/generated_list.c
index 189aa55..1183558 100644
--- a/src/parse/properties/generated_list.c
+++ b/src/parse/properties/generated_list.c
@@ -239,6 +239,14 @@ css_error parse_list_style(css_language *c,
prev_ctx = *ctx;
error = CSS_OK;
+ /* Ensure that we're not about to parse another inherit */
+ token = parserutils_vector_peek(vector, *ctx);
+ if (token != NULL && token->type == CSS_TOKEN_IDENT &&
+ token->ilower == c->strings[INHERIT]) {
+ error = CSS_INVALID;
+ goto cleanup;
+ }
+
if (image == NULL && (error = parse_list_style_image(c, vector,
ctx, &image)) == CSS_OK) {
} else if (position == NULL &&