Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Added error handling to StringUtil::stringToWideString() and StringUtil::wideStringToString() to avoid crashes caused by invalid characters.

Browse source
This commit is contained in:
Leon Styhre 2022-08-01 19:51:25 +02:00
parent 56665af45e
commit f550ba7dfc
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
es-core/src/utils/StringUtil.cpp
View file

@ -12,6 +12,7 @@
#endif #endif
#include "utils/StringUtil.h" #include "utils/StringUtil.h"
#include "Log.h"
#include <algorithm> #include <algorithm>
#include <locale> #include <locale>
@ -617,13 +618,27 @@ namespace Utils
std::wstring stringToWideString(const std::string& stringArg) std::wstring stringToWideString(const std::string& stringArg)
{ {
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> stringConverter; std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> stringConverter;
return stringConverter.from_bytes(stringArg); try {
return stringConverter.from_bytes(stringArg);
}
catch (...) {
LOG(LogError) << "StringUtil::stringToWideString(): Conversion failed, invalid "
"characters in source string?";
return L"";
}
} }
std::string wideStringToString(const std::wstring& stringArg) std::string wideStringToString(const std::wstring& stringArg)
{ {
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> stringConverter; std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> stringConverter;
return stringConverter.to_bytes(stringArg); try {
return stringConverter.to_bytes(stringArg);
}
catch (...) {
LOG(LogError) << "StringUtil::wideStringToString(): Conversion failed, invalid "
"characters in source string?";
return "";
}
} }
bool startsWith(const std::string& stringArg, const std::string& start) bool startsWith(const std::string& stringArg, const std::string& start)