From abd89a769ce914a9ca0acb967ecda2ebf4af3f4d Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 26 Jun 2009 23:07:09 +0000
Subject: Fix margin shorthand parser

svn path=/trunk/libcss/; revision=8029
---
 src/parse/properties/margin.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/parse/properties/margin.c')

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) {
-- 
cgit v1.2.3