Title: [209384] trunk/Source/WebCore
Revision
209384
Author
[email protected]
Date
2016-12-05 20:46:52 -0800 (Mon, 05 Dec 2016)

Log Message

[CSS Parser] Fix dashboard region parsing
https://bugs.webkit.org/show_bug.cgi?id=165456

Reviewed by Zalan Bujtas.

* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeWebkitDashboardRegion):
Make sure to reject whitespace by itself as well as unclosed dashboard-region functions.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209383 => 209384)


--- trunk/Source/WebCore/ChangeLog	2016-12-06 04:34:51 UTC (rev 209383)
+++ trunk/Source/WebCore/ChangeLog	2016-12-06 04:46:52 UTC (rev 209384)
@@ -1,5 +1,16 @@
 2016-12-05  Dave Hyatt  <[email protected]>
 
+        [CSS Parser] Fix dashboard region parsing
+        https://bugs.webkit.org/show_bug.cgi?id=165456
+
+        Reviewed by Zalan Bujtas.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeWebkitDashboardRegion):
+        Make sure to reject whitespace by itself as well as unclosed dashboard-region functions.
+
+2016-12-05  Dave Hyatt  <[email protected]>
+
         [CSS Parser] Properly reject large numeric values
         https://bugs.webkit.org/show_bug.cgi?id=165455
 

Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209383 => 209384)


--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp	2016-12-06 04:34:51 UTC (rev 209383)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp	2016-12-06 04:46:52 UTC (rev 209384)
@@ -3610,6 +3610,9 @@
 
 static RefPtr<CSSValue> consumeWebkitDashboardRegion(CSSParserTokenRange& range, CSSParserMode mode)
 {
+    if (range.atEnd())
+        return nullptr;
+    
     if (range.peek().id() == CSSValueNone)
         return consumeIdent(range);
     
@@ -3632,7 +3635,9 @@
         
         CSSParserTokenRange rangeCopy = range;
         CSSParserTokenRange args = consumeFunction(rangeCopy);
-        
+        if (rangeCopy.end() == args.end())
+            return nullptr; // No ) was found. Be strict about this, since tests are.
+
         // First arg is a label.
         if (args.peek().type() != IdentToken)
             return nullptr;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to