Changeset 36624 in webkit

Timestamp:

Sep 18, 2008 3:18:01 PM (16 years ago)

Author:

Beth Dakin

Message:

WebCore:

2008-09-18 Beth Dakin <Beth Dakin>

Reviewed by Dave Hyatt.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=20515 Crash upon
parsing CSS: unicode-range: searchfield-cancel-buttonpt=-webkit-
dashboard-region=
and corresponding: <rdar://problem/6174100>

This patch makes CSSParserValue::createCSSValue handle unknown
identifiers.

• css/CSSParserValues.cpp: (WebCore::CSSParserValue::createCSSValue): If we have an identifier with no id (an unknown identifier) create a CSSPrimitiveValue of type CSS_PARSER_IDENTIFIER
• css/CSSPrimitiveValue.cpp: (WebCore::CSSPrimitiveValue::cssText): (WebCore::CSSPrimitiveValue::parserValue):
• css/CSSPrimitiveValue.h: (WebCore::CSSPrimitiveValue::):

LayoutTests:

2008-09-18 Beth Dakin <Beth Dakin>

Reviewed by Dave Hyatt.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=20515 Crash upon
parsing CSS: unicode-range: searchfield-cancel-buttonpt=-webkit-
dashboard-region=
and corresponding: <rdar://problem/6174100>

• fast/css/variables/invalid-identifier-expected.txt: Added.
• fast/css/variables/invalid-identifier.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/variables/invalid-identifier-expected.txt (added)
• LayoutTests/fast/css/variables/invalid-identifier.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSParserValues.cpp (modified) (1 diff)
• WebCore/css/CSSPrimitiveValue.cpp (modified) (2 diffs)
• WebCore/css/CSSPrimitiveValue.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-09-18  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=20515 Crash upon 
+        parsing CSS: unicode-range: searchfield-cancel-buttonpt=-webkit-
+        dashboard-region=
+        and corresponding: <rdar://problem/6174100>
+
+        * fast/css/variables/invalid-identifier-expected.txt: Added.
+        * fast/css/variables/invalid-identifier.html: Added.
+
 2008-09-18  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-18  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=20515 Crash upon 
+        parsing CSS: unicode-range: searchfield-cancel-buttonpt=-webkit-
+        dashboard-region=
+        and corresponding: <rdar://problem/6174100>
+
+        This patch makes CSSParserValue::createCSSValue handle unknown 
+        identifiers.
+
+        * css/CSSParserValues.cpp:
+        (WebCore::CSSParserValue::createCSSValue): If we have an identifier 
+        with no id (an unknown identifier) create a CSSPrimitiveValue of 
+        type CSS_PARSER_IDENTIFIER
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::cssText):
+        (WebCore::CSSPrimitiveValue::parserValue):
+        * css/CSSPrimitiveValue.h:
+        (WebCore::CSSPrimitiveValue::):
+
 2008-09-18  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/css/CSSParserValues.cpp

@@ -62 +62 @@
     if (id)
         parsedValue = CSSPrimitiveValue::createIdentifier(id);
+    else if (unit == CSSPrimitiveValue::CSS_IDENT)
+        parsedValue = CSSPrimitiveValue::create(string, CSSPrimitiveValue::CSS_PARSER_IDENTIFIER);
     else if (unit == CSSPrimitiveValue::CSS_NUMBER && isInt)
         parsedValue = CSSPrimitiveValue::create(fValue, CSSPrimitiveValue::CSS_PARSER_INTEGER);

trunk/WebCore/css/CSSPrimitiveValue.cpp

@@ -770 +770 @@
             text = String(&c, 1U);
             break;
+        case CSS_PARSER_IDENTIFIER:
+            text = quoteStringIfNeeded(m_value.string);
+            break;
     }
     return text;
@@ -829 +832 @@
             value.isInt = true;
             break;
+        case CSS_PARSER_IDENTIFIER:
+            value.string.characters = const_cast<UChar*>(m_value.string->characters());
+            value.string.length = m_value.string->length();
+            value.unit = CSSPrimitiveValue::CSS_IDENT;
+            break;
         case CSS_UNKNOWN:
         case CSS_ATTR:

trunk/WebCore/css/CSSPrimitiveValue.h

@@ -76 +76 @@
         CSS_PARSER_VARIABLE_EQUALS_SYNTAX = 106,
         CSS_PARSER_VARIABLE_DOLLAR_SYNTAX = 107,
-        CSS_PARSER_HEXCOLOR = 108
+        CSS_PARSER_HEXCOLOR = 108,
+        
+        // This is used internally for unknown identifiers 
+        CSS_PARSER_IDENTIFIER = 109
     };