Changeset 230639 in webkit

Timestamp:

Apr 13, 2018 10:37:31 AM (6 years ago)

Author:

Chris Dumez

Message:

input.webkitEntries does not work as expected when folder contains accented chars
​https://bugs.webkit.org/show_bug.cgi?id=184517
<rdar://problem/39265537>

Reviewed by Alex Christensen.

Source/WebCore:

Use String::fromUTF8() to construct a WTF String from the char* returned by
dirname() in FileSystem::directoryName(). Previously, we were just calling
the String constructor, which would treat the input as latin 1 instead of
UTF-8.

Change is covered by an API test rather than a layout test due to file versioning
limitations.

• platform/posix/FileSystemPOSIX.cpp:

(WebCore::FileSystem::directoryName):

Tools:

Add API test coverage.

• TestWebKitAPI/Tests/WebCore/FileSystem.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/posix/FileSystemPOSIX.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/FileSystem.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-04-13  Chris Dumez  <cdumez@apple.com>
+
+        input.webkitEntries does not work as expected when folder contains accented chars
+        https://bugs.webkit.org/show_bug.cgi?id=184517
+        <rdar://problem/39265537>
+
+        Reviewed by Alex Christensen.
+
+        Use String::fromUTF8() to construct a WTF String from the char* returned by
+        dirname() in FileSystem::directoryName(). Previously, we were just calling
+        the String constructor, which would treat the input as latin 1 instead of
+        UTF-8.
+
+        Change is covered by an API test rather than a layout test due to file versioning
+        limitations.
+
+        * platform/posix/FileSystemPOSIX.cpp:
+        (WebCore::FileSystem::directoryName):
+
 2018-04-13  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp

@@ -352 +352 @@
         return String();
 
-    return dirname(fsRep.mutableData());
+    return String::fromUTF8(dirname(fsRep.mutableData()));
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-04-13  Chris Dumez  <cdumez@apple.com>
+
+        input.webkitEntries does not work as expected when folder contains accented chars
+        https://bugs.webkit.org/show_bug.cgi?id=184517
+        <rdar://problem/39265537>
+
+        Reviewed by Alex Christensen.
+
+        Add API test coverage.
+
+        * TestWebKitAPI/Tests/WebCore/FileSystem.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2018-04-13  Thibault Saunier  <tsaunier@igalia.com>
 

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

@@ -140 +140 @@
 }
 
+TEST_F(FileSystemTest, UnicodeDirectoryName)
+{
+    String path = String::fromUTF8("/test/a\u0308lo/test.txt");
+    String directoryName = FileSystem::directoryName(path);
+    String expectedDirectoryName = String::fromUTF8("/test/a\u0308lo");
+    EXPECT_TRUE(expectedDirectoryName == directoryName);
 }
+
+}