Changeset 211137 in webkit

Timestamp:

Jan 24, 2017, 11:49:49 PM (10 years ago)

Author:

achristensen@apple.com

Message:

REGRESSION (r208902): URLWithUserTypedString returns nil with file URLs
​https://bugs.webkit.org/show_bug.cgi?id=167402
Source/WebCore:

<rdar://problem/29896656>

Reviewed by Ryosuke Niwa.

Covered by a new API test.

• platform/mac/WebCoreNSURLExtras.mm:

(WebCore::mapHostNameWithRange):
uidna_IDNToASCII succeeds when length is 0.
uidna_nameToASCII fails when length is 0.
This causes bad things to happen with file URLs, which have no host, so their host length is 0.
This makes us match behavior before r208902.

Tools:

Reviewed by Ryosuke Niwa.

• TestWebKitAPI/Tests/WebCore/cocoa/URLExtras.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mac/WebCoreNSURLExtras.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/cocoa/URLExtras.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-24  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION (r208902): URLWithUserTypedString returns nil with file URLs
+        https://bugs.webkit.org/show_bug.cgi?id=167402
+        <rdar://problem/29896656>
+
+        Reviewed by Ryosuke Niwa.
+
+        Covered by a new API test.
+
+        * platform/mac/WebCoreNSURLExtras.mm:
+        (WebCore::mapHostNameWithRange):
+        uidna_IDNToASCII succeeds when length is 0.
+        uidna_nameToASCII fails when length is 0.
+        This causes bad things to happen with file URLs, which have no host, so their host length is 0.
+        This makes us match behavior before r208902.
+
 2017-01-24  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm

@@ -482 +482 @@
     UIDNAInfo processingDetails = UIDNA_INFO_INITIALIZER;
     int32_t numCharactersConverted = (encode ? uidna_nameToASCII : uidna_nameToUnicode)(&URLParser::internationalDomainNameTranscoder(), sourceBuffer, length, destinationBuffer, HOST_NAME_BUFFER_LENGTH, &processingDetails, &uerror);
-    if (U_FAILURE(uerror) || processingDetails.errors) {
+    if (length && (U_FAILURE(uerror) || processingDetails.errors)) {
         *error = YES;
         return nil;

trunk/Tools/ChangeLog

@@ +1 @@
+2017-01-24  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION (r208902): URLWithUserTypedString returns nil with file URLs
+        https://bugs.webkit.org/show_bug.cgi?id=167402
+
+        Reviewed by Ryosuke Niwa.
+
+        * TestWebKitAPI/Tests/WebCore/cocoa/URLExtras.mm:
+        (TestWebKitAPI::TEST):
+
 2017-01-24  Zalan Bujtas  <zalan@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/URLExtras.mm

@@ -128 +128 @@
 }
 
+TEST(WebCore, URLExtras_File)
+{
+    EXPECT_STREQ("file:///%E2%98%83", [[WebCore::URLWithUserTypedString(@"file:///☃", nil) absoluteString] UTF8String]);
+}
+
 TEST(WebCore, URLExtras_ParsingError)
 {