ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wchar_t buffer uneven allocate memory

This commit is contained in:
RadWolfie 2019-09-28 21:19:11 -05:00
parent b1d3cfb387
commit 0b0ad41ddb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/util/strConverter.hpp
View File

@ -41,7 +41,7 @@ static std::wstring utf8_to_utf16(const char* utf8_string)
// Depending on what type of UTF-16 string is input, otherwise will use native by default.
static std::string utf16_to_ascii(const wchar_t* utf16_string)
{
char* tempASCII = SDL_iconv_string(/*to:*/"ASCII", /*from:*/"UTF-16", reinterpret_cast<const char*>(utf16_string), wcslen(utf16_string)*2 + 1);
char* tempASCII = SDL_iconv_string(/*to:*/"ASCII", /*from:*/"UTF-16", reinterpret_cast<const char*>(utf16_string), wcslen(utf16_string)*2 + 2);
const std::string strASCII = tempASCII;
// Don't forget to free allocated string from SDL library.
SDL_free(tempASCII);
@ -52,7 +52,7 @@ static std::string utf16_to_ascii(const wchar_t* utf16_string)
// Enforce to expect little endian UTF-16 string is input.
static std::string utf16le_to_ascii(const wchar_t* utf16le_string)
{
char* tempASCII = SDL_iconv_string(/*to:*/"ASCII", /*from:*/"UTF-16LE", reinterpret_cast<const char*>(utf16le_string), wcslen(utf16le_string)*2 + 1);
char* tempASCII = SDL_iconv_string(/*to:*/"ASCII", /*from:*/"UTF-16LE", reinterpret_cast<const char*>(utf16le_string), wcslen(utf16le_string)*2 + 2);
const std::string strASCII = tempASCII;
// Don't forget to free allocated string from SDL library.
SDL_free(tempASCII);