zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: The WideString conversion function was missing a null check.

This commit is contained in:
Christoph Oelckers 2019-04-07 12:05:24 +02:00
parent 1096c14a3a
commit b60024b9c8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/utility/zstring.cpp
View File

@ -1314,6 +1314,7 @@ FString &FString::operator=(const wchar_t *copyStr)
std::wstring WideString(const char *cin) std::wstring WideString(const char *cin)
{ {
if (!cin) return L"";
const uint8_t *in = (const uint8_t*)cin; const uint8_t *in = (const uint8_t*)cin;
// This is a bit tricky because we need to support both UTF-8 and legacy content in ISO-8859-1 // This is a bit tricky because we need to support both UTF-8 and legacy content in ISO-8859-1
// and thanks to user-side string manipulation it can be that a text mixes both. // and thanks to user-side string manipulation it can be that a text mixes both.