Fix wide-to-utf8 conversions on Windows (#653)

codecvt_utf8 is for UCS2, not UTF-16, and all versions of Windows we would conceivably support use UTF-16. This replaces the incorrect conversions with the correct codecvt_utf8_utf16.
google · Jan 28, 2020 · 7a6897c · 7a6897c
1 parent 52da38c
commit 7a6897c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/example/windows/main.cpp b/example/windows/main.cpp
@@ -35,7 +35,7 @@ std::string GetExecutableDirectory() {
     std::cerr << "Couldn't locate executable" << std::endl;
     return "";
   }
-  std::wstring_convert<std::codecvt_utf8<wchar_t>> wide_to_utf8;
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> wide_to_utf8;
   std::string executable_path = wide_to_utf8.to_bytes(buffer);
   size_t last_separator_position = executable_path.find_last_of('\\');
   if (last_separator_position == std::string::npos) {

diff --git a/plugins/flutter_plugins/path_provider_fde/windows/path_provider_plugin.cpp b/plugins/flutter_plugins/path_provider_fde/windows/path_provider_plugin.cpp
@@ -30,7 +30,7 @@ using flutter::EncodableValue;
 
 // Converts an null-terminated array of wchar_t's to a std::string.
 std::string StdStringFromWideChars(wchar_t *wide_chars) {
-  std::wstring_convert<std::codecvt_utf8<wchar_t>> wide_to_utf8;
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> wide_to_utf8;
   return wide_to_utf8.to_bytes(wide_chars);
 }
 
@@ -119,8 +119,7 @@ void PathProviderPlugin::HandleMethodCall(
       result->Error("Unable to get temporary path");
       return;
     }
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> wide_to_utf8;
-    std::string result_path = wide_to_utf8.to_bytes(path_buffer);
+    std::string result_path = StdStringFromWideChars(path_buffer);
     flutter::EncodableValue response(result_path);
     result->Success(&response);
   } else if (method_call.method_name().compare(