Merge pull request schombert#1787 from Nivaturimika/patch-82

fix random crashes on old windows 10/7
Nivaturimika · Oct 21, 2024 · 1e8038b · 1e8038b
2 parents 1ba940d + d7c243f
commit 1e8038b
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/filesystem/simple_fs_win.cpp b/src/filesystem/simple_fs_win.cpp
@@ -477,15 +477,21 @@ native_string win1250_to_native(std::string_view data_in) {
 }
 
 native_string utf8_to_native(std::string_view str) {
-	auto buffer = std::unique_ptr<WCHAR[]>(new WCHAR[str.length() * 2]);
-	auto chars_written = MultiByteToWideChar(CP_UTF8, MB_PRECOMPOSED, str.data(), int32_t(str.length()), buffer.get(), int32_t(str.length() * 2));
-	return native_string(buffer.get(), size_t(chars_written));
+	if(str.size() > 0) {
+		auto buffer = std::unique_ptr<WCHAR[]>(new WCHAR[str.length() * 2]);
+		auto chars_written = MultiByteToWideChar(CP_UTF8, 0, str.data(), int32_t(str.length()), buffer.get(), int32_t(str.length() * 2));
+		return native_string(buffer.get(), size_t(chars_written));
+	}
+	return native_string(NATIVE(""));
 }
 
 std::string native_to_utf8(native_string_view str) {
-	auto buffer = std::unique_ptr<char[]>(new char[str.length() * 4]);
-	auto chars_written = WideCharToMultiByte(CP_UTF8, 0, str.data(), int32_t(str.length()), buffer.get(), int32_t(str.length() * 4), nullptr, nullptr);
-	return std::string(buffer.get(), size_t(chars_written));
+	if(str.size() > 0) {
+		auto buffer = std::unique_ptr<char[]>(new char[str.length() * 4]);
+		auto chars_written = WideCharToMultiByte(CP_UTF8, 0, str.data(), int32_t(str.length()), buffer.get(), int32_t(str.length() * 4), NULL, NULL);
+		return std::string(buffer.get(), size_t(chars_written));
+	}
+	return std::string("");
 }
 
 std::string remove_double_backslashes(std::string_view data_in) {