fs: fix cpSync crash on utf characters

nodejs · Aug 31, 2024 · 52d0c3a · 52d0c3a
1 parent 4c844a2
commit 52d0c3a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -3130,14 +3130,14 @@ static void CpSyncCheckPaths(const FunctionCallbackInfo<Value>& args) {
   ToNamespacedPath(env, &src);
   THROW_IF_INSUFFICIENT_PERMISSIONS(
       env, permission::PermissionScope::kFileSystemRead, src.ToStringView());
-  auto src_path = std::filesystem::path(src.ToStringView());
+  auto src_path = std::filesystem::path(src.ToWString());
 
   BufferValue dest(isolate, args[1]);
   CHECK_NOT_NULL(*dest);
   ToNamespacedPath(env, &dest);
   THROW_IF_INSUFFICIENT_PERMISSIONS(
       env, permission::PermissionScope::kFileSystemWrite, dest.ToStringView());
-  auto dest_path = std::filesystem::path(dest.ToStringView());
+  auto dest_path = std::filesystem::path(dest.ToWString());
 
   bool dereference = args[2]->IsTrue();
   bool recursive = args[3]->IsTrue();

diff --git a/src/util.h b/src/util.h
@@ -126,6 +126,10 @@ void DumpJavaScriptBacktrace(FILE* fp);
 #define ABORT_NO_BACKTRACE() abort()
 #endif
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 // Caller of this macro must not be marked as [[noreturn]]. Printing of
 // backtraces may not work correctly in [[noreturn]] functions because
 // when generating code for them the compiler can choose not to
@@ -562,6 +566,14 @@ class BufferValue : public MaybeStackBuffer<char> {
   inline std::string_view ToStringView() const {
     return std::string_view(out(), length());
   }
+  inline std::wstring ToWString() const {
+    #ifdef _WIN32
+    auto size_needed = MultiByteToWideChar(CP_UTF8, 0, out(), (int)length(), NULL, 0);
+    std::wstring wstrTo(length(), 0);
+    MultiByteToWideChar(CP_UTF8, 0, out(), (int)length(), &wstrTo[0], size_needed);
+    return wstrTo;
+    #endif;
+  }
 };
 
 #define SPREAD_BUFFER_ARG(val, name)                                           \

diff --git a/test/fixtures/copy/utf/新建文件/index.js b/test/fixtures/copy/utf/新建文件/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  purpose: 'testing copy'
+};
diff --git a/test/parallel/test-fs-cp.mjs b/test/parallel/test-fs-cp.mjs
@@ -30,6 +30,14 @@ function nextdir() {
 
 // Synchronous implementation of copy.
 
+// It copies a nested folder containing UTF characters.
+{
+  const src = './test/fixtures/copy/utf/新建文件';
+  const dest = nextdir();
+  cpSync(src, dest, mustNotMutateObjectDeep({ recursive: true }));
+  assertDirEquivalent(src, dest);
+}
+
 // It copies a nested folder structure with files and folders.
 {
   const src = './test/fixtures/copy/kitchen-sink';