sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Crash): Improved Utf8toWStr() function to prevent crashes (#2407)

Browse Source
This commit is contained in:
Stefano Borzì
2019-11-06 09:34:24 +01:00
committed by Stoabrogga
parent 77c97598f0
commit c294dd3142
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Utilities/Util.cpp
+4 -7
View File
@@ -333,17 +333,14 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr) bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr)
{ {
wstr.clear();
try try
{ {
if (size_t len = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size())) utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), std::back_inserter(wstr));
{
wstr.resize(len);
utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), &wstr[0]);
} }
} catch(std::exception const&)
catch(std::exception)
{ {
wstr = L""; wstr.clear();
return false; return false;
} }