Changeset 211107 in webkit

Timestamp:

Jan 24, 2017, 1:23:05 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211067. rdar://problem/29319962

Location:

branches/safari-603-branch

Files:

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

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211067. rdar://problem/29319962
+
+    2017-01-23  Alex Christensen  <achristensen@webkit.org>
+
+            URLParser should fail to parse percent-encoded invalid UTF-8 sequences
+            https://bugs.webkit.org/show_bug.cgi?id=167330
+            <rdar://problem/29319962>
+
+            Reviewed by Tim Horton.
+
+            Covered by new API tests.
+
+            * platform/URLParser.cpp:
+            (WebCore::containsOnlyASCII):
+            (WebCore::URLParser::parseHostAndPort):
+            If UTF-8 decoding fails after percent-decoding the host, fail to parse.
+            This matches Chrome and Firefox, and it was proposed to the spec in https://github.com/whatwg/url/issues/215
+
 2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/platform/URLParser.cpp

@@ -2454 +2454 @@
 ALWAYS_INLINE static bool containsOnlyASCII(const String& string)
 {
+    ASSERT(!string.isNull());
     if (string.is8Bit())
         return charactersAreAllASCII(string.characters8(), string.length());
@@ -2671 +2672 @@
     Vector<LChar, defaultInlineBufferSize> percentDecoded = percentDecode(utf8Encoded.data(), utf8Encoded.size(), hostBegin);
     String domain = String::fromUTF8(percentDecoded.data(), percentDecoded.size());
+    if (domain.isNull())
+        return false;
     if (domain != StringView(percentDecoded.data(), percentDecoded.size()))
         syntaxViolation(hostBegin);

branches/safari-603-branch/Tools/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211067. rdar://problem/29319962
+
+    2017-01-23  Alex Christensen  <achristensen@webkit.org>
+
+            URLParser should fail to parse percent-encoded invalid UTF-8 sequences
+            https://bugs.webkit.org/show_bug.cgi?id=167330
+
+            Reviewed by Tim Horton.
+
+            * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+            (TestWebKitAPI::TEST_F):
+
 2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp

@@ -788 +788 @@
         {"file", "", "", "", 0, "/pAtH/", "", "", "file:///pAtH/"},
         {"file", "", "", "", 0, "pAtH/", "", "", "file://pAtH/"});
-    
+    checkURLDifferences("http://example.com%A0",
+        {"", "", "", "", 0, "", "", "", "http://example.com%A0"},
+        {"http", "", "", "example.com%a0", 0, "/", "", "", "http://example.com%a0/"});
+    checkURLDifferences("http://%E2%98%83",
+        {"http", "", "", "xn--n3h", 0, "/", "", "", "http://xn--n3h/"},
+        {"http", "", "", "%e2%98%83", 0, "/", "", "", "http://%e2%98%83/"});
     checkURLDifferences("http://host%73",
         {"http", "", "", "hosts", 0, "/", "", "", "http://hosts/"},