Changeset 245982 in webkit

Timestamp:

May 31, 2019, 1:55:25 PM (7 years ago)

Author:

achristensen@apple.com

Message:

URLParser::parseHostAndPort should not allow non-port characters after an ipv6 host
​https://bugs.webkit.org/show_bug.cgi?id=198428
<rdar://problem/51209196>

Reviewed by Tim Horton.

Source/WTF:

This matches Chrome and Firefox.

• wtf/URLParser.cpp:

(WTF::URLParser::parseHostAndPort):

Tools:

• TestWebKitAPI/Tests/WTF/URLParser.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/URLParser.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-05-31  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser::parseHostAndPort should not allow non-port characters after an ipv6 host
+        https://bugs.webkit.org/show_bug.cgi?id=198428
+        <rdar://problem/51209196>
+
+        Reviewed by Tim Horton.
+
+        This matches Chrome and Firefox.
+
+        * wtf/URLParser.cpp:
+        (WTF::URLParser::parseHostAndPort):
+
 2019-05-31  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WTF/wtf/URLParser.cpp

@@ -2651 +2651 @@
             if (!ipv6End.atEnd()) {
                 advance(ipv6End);
-                if (!ipv6End.atEnd() && *ipv6End == ':') {
-                    m_url.m_hostEnd = currentPosition(ipv6End);
+                m_url.m_hostEnd = currentPosition(ipv6End);
+                if (!ipv6End.atEnd() && *ipv6End == ':')
                     return parsePort(ipv6End);
-                }
-                m_url.m_hostEnd = currentPosition(ipv6End);
                 m_url.m_portLength = 0;
-                return true;
+                return ipv6End.atEnd();
             }
             m_url.m_hostEnd = currentPosition(ipv6End);

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-31  Alex Christensen  <achristensen@webkit.org>
+
+        URLParser::parseHostAndPort should not allow non-port characters after an ipv6 host
+        https://bugs.webkit.org/show_bug.cgi?id=198428
+        <rdar://problem/51209196>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WTF/URLParser.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2019-05-28  Dewei Zhu  <dewei_zhu@apple.com>
 

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

@@ -1212 +1212 @@
     shouldFail("about~");
     shouldFail("//C:asdf/foo/bar", "file:///tmp/mock/path");
+    shouldFail("wss://[c::]abc/");
+    shouldFail("abc://[c::]:abc/");
+    shouldFail("abc://[c::]01");
     shouldFail("http://[1234::ab#]");
     shouldFail("http://[1234::ab/]");