summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-06-26 23:07:09 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-06-26 23:07:09 +0000
commitabd89a769ce914a9ca0acb967ecda2ebf4af3f4d (patch)
tree006f27e177361213c8f834adef69c38e1c94e364
parent7eaeb442b0bd727bb4e70b177152b90a94a1ce0f (diff)
downloadlibcss-abd89a769ce914a9ca0acb967ecda2ebf4af3f4d.tar.gz
libcss-abd89a769ce914a9ca0acb967ecda2ebf4af3f4d.tar.bz2
Fix margin shorthand parser
svn path=/trunk/libcss/; revision=8029
-rw-r--r--src/parse/properties/margin.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/parse/properties/margin.c b/src/parse/properties/margin.c
index 76147f1..764177e 100644
--- a/src/parse/properties/margin.c
+++ b/src/parse/properties/margin.c
@@ -87,6 +87,13 @@ css_error parse_margin(css_language *c,
prev_ctx = *ctx;
error = CSS_OK;
+ 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 (top == NULL &&
(error = parse_margin_side(c, vector, ctx,
CSS_PROP_MARGIN_TOP, &top)) == CSS_OK) {