StdStringEncodingConverter: Fix exception on empty inputs by returnin…

…g early
legacyclonk · Dec 3, 2024 · 33f2b57 · 33f2b57
1 parent 23064b1
commit 33f2b57
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/StdStringEncodingConverter.cpp b/src/StdStringEncodingConverter.cpp
@@ -21,6 +21,11 @@
 
 std::wstring StdStringEncodingConverter::WinAcpToUtf16(const std::string_view multiByte)
 {
+	if (multiByte.empty())
+	{
+		return L"";
+	}
+
 	std::wstring result;
 	result.resize_and_overwrite(MultiByteToWideChar(CP_ACP, multiByte, {}), [&multiByte](wchar_t *const ptr, const std::size_t size)
 	{
@@ -32,6 +37,11 @@ std::wstring StdStringEncodingConverter::WinAcpToUtf16(const std::string_view mu
 
 std::string StdStringEncodingConverter::Utf16ToWinAcp(const std::wstring_view wide)
 {
+	if (wide.empty())
+	{
+		return "";
+	}
+
 	std::string result;
 	result.resize_and_overwrite(WideCharToMultiByte(CP_ACP, wide, {}), [&wide](char *const ptr, const std::size_t size)
 	{