src: use std::u8string instead of std::string to pass path constructor

Enforce that it is u8 because it was crashing when loading files containing Japanese in Windows, cp392 environment. Fixes: nodejs#56650
yamachu · Jan 19, 2025 · 8f2c277 · 8f2c277
1 parent 6f946c9
commit 8f2c277
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -548,7 +548,7 @@ static void ReportFatalException(Environment* env,
       FPrintF(stderr,
               "(Use `%s --trace-uncaught ...` to show where the exception "
               "was thrown)\n",
-              filesystem_path.filename().string());
+              filesystem_path.filename().string().c_str());
     }
   }
 

diff --git a/src/node_modules.cc b/src/node_modules.cc
@@ -340,12 +340,14 @@ void BindingData::GetNearestParentPackageJSON(
   ToNamespacedPath(realm->env(), &path_value);
 
   std::string path_value_str = path_value.ToString();
+  auto path_value_u8str =
+      std::u8string(path_value_str.begin(), path_value_str.end());
   if (slashCheck) {
-    path_value_str.push_back(kPathSeparator);
+    path_value_u8str.push_back(kPathSeparator);
   }
 
   auto package_json =
-      TraverseParent(realm, std::filesystem::path(path_value_str));
+      TraverseParent(realm, std::filesystem::path(path_value_u8str));
 
   if (package_json != nullptr) {
     args.GetReturnValue().Set(package_json->Serialize(realm));
@@ -366,12 +368,14 @@ void BindingData::GetNearestParentPackageJSONType(
   ToNamespacedPath(realm->env(), &path_value);
 
   std::string path_value_str = path_value.ToString();
+  auto path_value_u8str =
+    std::u8string(path_value_str.begin(), path_value_str.end());
   if (slashCheck) {
-    path_value_str.push_back(kPathSeparator);
+    path_value_u8str.push_back(kPathSeparator);
   }
 
   auto package_json =
-      TraverseParent(realm, std::filesystem::path(path_value_str));
+      TraverseParent(realm, std::filesystem::path(path_value_u8str));
 
   if (package_json == nullptr) {
     return;