Changeset 173965 in webkit

Timestamp:

Sep 25, 2014 7:50:12 AM (10 years ago)

Author:

jfernandez@igalia.com

Message:

ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
​https://bugs.webkit.org/show_bug.cgi?id=136945

Reviewed by Sergio Villar Senin.

Source/WebCore:

Checking out whether the grid-template-areas value contains a white-space only
string, which is not valid as it does not produce a cell token.

Test: fast/css-grid-layout/grid-template-areas-empty-string-crash.html

• css/CSSParser.cpp:

(WebCore::CSSParser::parseGridTemplateAreasRow):

LayoutTests:

Testing the different types of white-space only strings for the grid-template-areas
property, which is not valid as it does not produce a cell token.

• fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt: Added.
• fast/css-grid-layout/grid-template-areas-empty-string-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-09-25  Javier Fernandez  <jfernandez@igalia.com>
+
+        ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
+        https://bugs.webkit.org/show_bug.cgi?id=136945
+
+        Reviewed by Sergio Villar Senin.
+
+        Testing the different types of white-space only strings for the grid-template-areas
+        property, which is not valid as it does not produce a cell token.
+
+        * fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt: Added.
+        * fast/css-grid-layout/grid-template-areas-empty-string-crash.html: Added.
+
 2014-09-25  Lorenzo Tilve  <ltilve@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-25  Javier Fernandez  <jfernandez@igalia.com>
+
+        ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
+        https://bugs.webkit.org/show_bug.cgi?id=136945
+
+        Reviewed by Sergio Villar Senin.
+
+        Checking out whether the grid-template-areas value contains a white-space only
+        string, which is not valid as it does not produce a cell token.
+
+        Test: fast/css-grid-layout/grid-template-areas-empty-string-crash.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseGridTemplateAreasRow):
+
 2014-09-25  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -5569 +5569 @@
 
     String gridRowNames = currentValue->string;
-    if (gridRowNames.isEmpty())
+    if (gridRowNames.isEmpty() || gridRowNames.containsOnlyWhitespace())
         return false;