Title: [173965] trunk
- Revision
- 173965
- Author
- [email protected]
- Date
- 2014-09-25 07:50:12 -0700 (Thu, 25 Sep 2014)
Log 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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (173964 => 173965)
--- trunk/LayoutTests/ChangeLog 2014-09-25 14:45:22 UTC (rev 173964)
+++ trunk/LayoutTests/ChangeLog 2014-09-25 14:50:12 UTC (rev 173965)
@@ -1,3 +1,16 @@
+2014-09-25 Javier Fernandez <[email protected]>
+
+ 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 <[email protected]>
[GTK] Unreviewed GTK gardening.
Added: trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt (0 => 173965)
--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt 2014-09-25 14:50:12 UTC (rev 173965)
@@ -0,0 +1,5 @@
+webkit.org/b/136945 - ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
+
+This test has PASSED if it doesn't CRASH.
+
+
Added: trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html (0 => 173965)
--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html 2014-09-25 14:50:12 UTC (rev 173965)
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html
+<head>
+<link href="" rel="stylesheet">
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+.space {
+ -webkit-grid-template-areas: "\0020";
+}
+.tab {
+ -webkit-grid-template-areas: "\0009";
+}
+.lineFeed {
+ -webkit-grid-template-areas: "\000A";
+}
+.carriageReturn {
+ -webkit-grid-template-areas: "\000D";
+}
+.formFeed {
+ -webkit-grid-template-areas: "\000C";
+}
+.multipleSpace {
+ -webkit-grid-template-areas: " ";
+}
+</style>
+</head>
+<p>webkit.org/b/136945 - ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow</p>
+<p>This test has PASSED if it doesn't CRASH.</p>
+<div class="grid space"></div>
+<div class="grid tab"></div>
+<div class="grid lineFeed"></div>
+<div class="grid carriageReturn"></div>
+<div class="grid formFeed"></div>
+<div class="grid multipleSpace"></div>
Modified: trunk/Source/WebCore/ChangeLog (173964 => 173965)
--- trunk/Source/WebCore/ChangeLog 2014-09-25 14:45:22 UTC (rev 173964)
+++ trunk/Source/WebCore/ChangeLog 2014-09-25 14:50:12 UTC (rev 173965)
@@ -1,3 +1,18 @@
+2014-09-25 Javier Fernandez <[email protected]>
+
+ 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 <[email protected]>
Remove WinCE port from trunk
Modified: trunk/Source/WebCore/css/CSSParser.cpp (173964 => 173965)
--- trunk/Source/WebCore/css/CSSParser.cpp 2014-09-25 14:45:22 UTC (rev 173964)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-09-25 14:50:12 UTC (rev 173965)
@@ -5568,7 +5568,7 @@
return false;
String gridRowNames = currentValue->string;
- if (gridRowNames.isEmpty())
+ if (gridRowNames.isEmpty() || gridRowNames.containsOnlyWhitespace())
return false;
Vector<String> columnNames;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
