The-Homebrew-Cloud/libgui
2
0
Fork 0
mirror of https://github.com/wiiu-env/libgui.git synced 2024-11-14 20:35:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3

Browse Source 
Signed-off-by: Thomas Rohloff <v10lator@myway.de>
This commit is contained in:
Thomas Rohloff 2020-04-26 14:43:01 +02:00
parent 45bad52a0c
commit e049594552
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/gui/FreeTypeGX.cpp
View File

@ -70,11 +70,15 @@ FreeTypeGX::~FreeTypeGX() {
wchar_t* FreeTypeGX::charToWideChar(const char* strChar) { wchar_t* FreeTypeGX::charToWideChar(const char* strChar) {
if (!strChar) return NULL; if (!strChar) return NULL;
wchar_t *strWChar = new (std::nothrow) wchar_t[strlen(strChar) + 1]; size_t len = strlen(strChar) + 1;
wchar_t *strWChar = new (std::nothrow) wchar_t[len];
if (!strWChar) return NULL; if (!strWChar) return NULL;
int32_t bt = mbstowcs(strWChar, strChar, strlen(strChar)); size_t bt = mbstowcs(strWChar, strChar, len);
if (bt > 0) { if (bt == (size_t)-1)
return NULL;
if (bt < --len) {
strWChar[bt] = 0; strWChar[bt] = 0;
return strWChar; return strWChar;
} }
@ -130,6 +134,7 @@ char *FreeTypeGX::wideCharToUTF8(const wchar_t* strChar) {
pOut[n++] = (char)((wc & 0x3F) | 0x80); pOut[n++] = (char)((wc & 0x3F) | 0x80);
} }
} }
pOut[n] = '\0';
return pOut; return pOut;
} }