Changeset 162687 in webkit

Timestamp:

Jan 23, 2014 9:21:21 PM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/15875326> REGRESSION (r162257): Assertion failure (should not be reached) in CSSPreloadScanner::tokenize()
​https://bugs.webkit.org/show_bug.cgi?id=127540

Reviewed by Anders Carlsson.

No new tests, because I could not reproduce the bug reliably and I don’t know how to trigger
it.

• html/parser/CSSPreloadScanner.cpp:

(WebCore::CSSPreloadScanner::scan): Check for the DoneParsingImportRules before tokenizing
a character, not after. This restores the logic from before r162257.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/CSSPreloadScanner.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-23  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/15875326> REGRESSION (r162257): Assertion failure (should not be reached) in CSSPreloadScanner::tokenize()
+        https://bugs.webkit.org/show_bug.cgi?id=127540
+
+        Reviewed by Anders Carlsson.
+
+        No new tests, because I could not reproduce the bug reliably and I don’t know how to trigger
+        it.
+
+        * html/parser/CSSPreloadScanner.cpp:
+        (WebCore::CSSPreloadScanner::scan): Check for the DoneParsingImportRules before tokenizing
+        a character, not after. This restores the logic from before r162257.
+
 2014-01-23  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/html/parser/CSSPreloadScanner.cpp

@@ -57 +57 @@
 
     for (UChar c : data) {
+        if (m_state == DoneParsingImportRules)
+            break;
+
         tokenize(c);
-
-        if (m_state == DoneParsingImportRules)
-            break;
     }
 }