From ea8a36ff357175ca21031b14e7c9fa7bc473e296 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Tue, 12 Mar 2002 15:28:27 +0000 Subject: [PATCH] Fix hang when style.cssText is set to an unrecognized value. Bug 129927, r=dbaron, sr=jst, a=roc+moz git-svn-id: svn://10.0.0.236/trunk@116404 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSParser.cpp | 7 +++++++ mozilla/layout/style/nsCSSParser.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 0508806082a..62de0569841 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -730,6 +730,13 @@ CSSParserImpl::ParseAndAppendDeclaration(const nsAReadableString& aBuffer, if (NS_FAILED(errorCode)) break; + + if (!SkipDeclaration(errorCode, PR_FALSE)) { + if (errorCode != -1) { + rv = errorCode; + } + break; + } } } while (!aParseOnlyOneDecl); diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp index 0508806082a..62de0569841 100644 --- a/mozilla/layout/style/nsCSSParser.cpp +++ b/mozilla/layout/style/nsCSSParser.cpp @@ -730,6 +730,13 @@ CSSParserImpl::ParseAndAppendDeclaration(const nsAReadableString& aBuffer, if (NS_FAILED(errorCode)) break; + + if (!SkipDeclaration(errorCode, PR_FALSE)) { + if (errorCode != -1) { + rv = errorCode; + } + break; + } } } while (!aParseOnlyOneDecl);