Changeset 104885 in webkit

Timestamp:

Jan 12, 2012, 5:27:28 PM (15 years ago)

Author:

ap@apple.com

Message:

NSURL to KURL conversion shouldn't turn raw paths into file URLs
​https://bugs.webkit.org/show_bug.cgi?id=76234

Reviewed by Darin Adler.

• platform/mac/KURLMac.mm: (WebCore::KURL::KURL): Removed this code.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/KURLMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-12  Alexey Proskuryakov  <ap@apple.com>
+
+        NSURL to KURL conversion shouldn't turn raw paths into file URLs
+        https://bugs.webkit.org/show_bug.cgi?id=76234
+
+        Reviewed by Darin Adler.
+
+        * platform/mac/KURLMac.mm: (WebCore::KURL::KURL): Removed this code.
+
 2012-01-12  Anders Carlsson  <andersca@apple.com>
 

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

@@ -43 +43 @@
 
     CFIndex bytesLength = CFURLGetBytes(reinterpret_cast<CFURLRef>(url), 0, 0);
-    Vector<char, 512> buffer(bytesLength + 6); // 5 for "file:", 1 for null character to end C string
-    char* bytes = &buffer[5];
+    Vector<char, 512> buffer(bytesLength + 1);
+    char* bytes = &buffer[0];
     CFURLGetBytes(reinterpret_cast<CFURLRef>(url), reinterpret_cast<UInt8*>(bytes), bytesLength);
     bytes[bytesLength] = '\0';
-    if (bytes[0] != '/') {
-        parse(bytes);
-        return;
-    }
-
-    buffer[0] = 'f';
-    buffer[1] = 'i';
-    buffer[2] = 'l';
-    buffer[3] = 'e';
-    buffer[4] = ':';
-
-    parse(buffer.data());
+    parse(bytes);
 }