Changeset 205668 in webkit

Timestamp:

Sep 8, 2016, 3:16:49 PM (9 years ago)

Author:

achristensen@apple.com

Message:

URLParser should correctly handle \ in path
​https://bugs.webkit.org/show_bug.cgi?id=161762

Reviewed by Brady Eidson.

Source/WebCore:

Covered by new API tests.

• platform/URLParser.cpp:

(WebCore::isSpecialScheme):
(WebCore::bufferView):
(WebCore::URLParser::parse):
Treat \ as / in the path of special URLs as described in the spec and tested in web platform tests.
Also a slight performance improvement using StringViews instead of copied Strings.

Tools:

• TestWebKitAPI/Tests/WebCore/URLParser.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-08  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should correctly handle \ in path
+        https://bugs.webkit.org/show_bug.cgi?id=161762
+
+        Reviewed by Brady Eidson.
+
+        Covered by new API tests.
+
+        * platform/URLParser.cpp:
+        (WebCore::isSpecialScheme):
+        (WebCore::bufferView):
+        (WebCore::URLParser::parse):
+        Treat \ as / in the path of special URLs as described in the spec and tested in web platform tests.
+        Also a slight performance improvement using StringViews instead of copied Strings.
+
 2016-09-08  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -140 +140 @@
 }
 
-static bool isSpecialScheme(const String& scheme)
+static bool isSpecialScheme(StringView scheme)
 {
     return scheme == "ftp"
@@ -149 +149 @@
         || scheme == "ws"
         || scheme == "wss";
+}
+
+static StringView bufferView(const StringBuilder& builder)
+{
+    if (builder.is8Bit())
+        return StringView(builder.characters8(), builder.length());
+    return StringView(builder.characters16(), builder.length());
 }
 
@@ -395 +402 @@
 #define LOG_FINAL_STATE(x) LOG(URLParser, "Final State: %s", x)
 
+    bool urlIsSpecial = false;
     State state = State::SchemeStart;
     while (c != end) {
@@ -418 +426 @@
             else if (*c == ':') {
                 m_url.m_schemeEnd = m_buffer.length();
-                String urlScheme = m_buffer.toString(); // FIXME: Find a way to do this without shrinking the m_buffer.
+                StringView urlScheme = bufferView(m_buffer);
                 m_url.m_protocolIsInHTTPFamily = urlScheme == "http" || urlScheme == "https";
                 if (urlScheme == "file") {
+                    urlIsSpecial = true;
                     state = State::File;
                     m_buffer.append(':');
@@ -427 +436 @@
                 }
                 if (isSpecialScheme(urlScheme)) {
+                    urlIsSpecial = true;
                     if (base.protocol() == urlScheme)
                         state = State::SpecialRelativeOrAuthority;
@@ -747 +757 @@
         case State::Path:
             LOG_STATE("Path");
-            if (*c == '/') {
+            if (*c == '/' || (urlIsSpecial && *c == '\\')) {
                 m_buffer.append('/');
                 m_url.m_pathAfterLastSlash = m_buffer.length();

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-08  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser should correctly handle \ in path
+        https://bugs.webkit.org/show_bug.cgi?id=161762
+
+        Reviewed by Brady Eidson.
+
+        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2016-09-08  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -238 +238 @@
     checkRelativeURL("http://@host", "about:blank", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
     checkRelativeURL("http://:@host", "about:blank", {"http", "", "", "host", 0, "/", "", "", "http://host/"});
+    checkRelativeURL("http://foo.com/\\@", "http://example.org/foo/bar", {"http", "", "", "foo.com", 0, "//@", "", "", "http://foo.com//@"});
+    checkRelativeURL("\\@", "http://example.org/foo/bar", {"http", "", "", "example.org", 0, "/@", "", "", "http://example.org/@"});
 }