Changeset 224202 in webkit

Timestamp:

Oct 30, 2017, 2:55:28 PM (7 years ago)

Author:

achristensen@apple.com

Message:

ASSERTION FAILED: internalValuesConsistent(m_url) in WebCore::URLParser::URLParser
​https://bugs.webkit.org/show_bug.cgi?id=178861

Reviewed by Tim Horton.

Source/WebCore:

This is a dark corner of the URL spec that has wildly different behavior in different browsers.
The assertion fired when we have a file URL with a ? or a # after ​file:// and it was because
m_pathAfterLastSlash was still 0. We definitely shouldn't assert. I'm making us consistent with
other cases where we have nothing there and add an implied missing slash.

Covered by new API tests.

• platform/URLParser.cpp:

(WebCore::URLParser::parse):

Tools:

• TestWebKitAPI/Tests/WebCore/URLParser.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-30  Alex Christensen  <achristensen@webkit.org>
+
+        ASSERTION FAILED: internalValuesConsistent(m_url) in WebCore::URLParser::URLParser
+        https://bugs.webkit.org/show_bug.cgi?id=178861
+
+        Reviewed by Tim Horton.
+
+        This is a dark corner of the URL spec that has wildly different behavior in different browsers.
+        The assertion fired when we have a file URL with a ? or a # after file:// and it was because
+        m_pathAfterLastSlash was still 0. We definitely shouldn't assert. I'm making us consistent with
+        other cases where we have nothing there and add an implied missing slash.
+        
+        Covered by new API tests.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parse):
+
 2017-10-27  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -1729 +1729 @@
         case State::PathStart:
             LOG_STATE("PathStart");
-            if (*c != '/' && *c != '\\')
-                ++c;
+            if (*c != '/' && *c != '\\') {
+                syntaxViolation(c);
+                appendToASCIIBuffer('/');
+            }
+            m_url.m_pathAfterLastSlash = currentPosition(c);
             state = State::Path;
             break;

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-30  Alex Christensen  <achristensen@webkit.org>
+
+        ASSERTION FAILED: internalValuesConsistent(m_url) in WebCore::URLParser::URLParser
+        https://bugs.webkit.org/show_bug.cgi?id=178861
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2017-10-30  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp

@@ -362 +362 @@
     checkURL("file:////?query", {"file", "", "", "", 0, "//", "query", "", "file:////?query"});
     checkURL("file:////#fragment", {"file", "", "", "", 0, "//", "", "fragment", "file:////#fragment"});
+    checkURL("file://?Q", {"file", "", "", "", 0, "/", "Q", "", "file:///?Q"});
+    checkURL("file://#F", {"file", "", "", "", 0, "/", "", "F", "file:///#F"});
+    checkURL("file://host?Q", {"file", "", "", "host", 0, "/", "Q", "", "file://host/?Q"});
+    checkURL("file://host#F", {"file", "", "", "host", 0, "/", "", "F", "file://host/#F"});
+    checkURL("file://host\\P", {"file", "", "", "host", 0, "/P", "", "", "file://host/P"});
+    checkURL("file://host\\?Q", {"file", "", "", "host", 0, "/", "Q", "", "file://host/?Q"});
+    checkURL("file://host\\../P", {"file", "", "", "host", 0, "/P", "", "", "file://host/P"});
+    checkURL("file://host\\/../P", {"file", "", "", "host", 0, "/P", "", "", "file://host/P"});
+    checkURL("file://host\\/P", {"file", "", "", "host", 0, "//P", "", "", "file://host//P"});
     checkURL("http://host/A b", {"http", "", "", "host", 0, "/A%20b", "", "", "http://host/A%20b"});
     checkURL("http://host/a%20B", {"http", "", "", "host", 0, "/a%20B", "", "", "http://host/a%20B"});