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

fix bugs in utf8/utf16 string conversion functions dating back to libretro-common installation

This commit is contained in:
zeromus 2018-09-22 15:54:28 -04:00
parent acb140209a
commit 1b10b39603
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/utils/xstring.cpp
View File

@ -290,7 +290,7 @@ std::wstring mbstowcs(std::string str)
size_t len = utf8len(str.c_str()); size_t len = utf8len(str.c_str());
u32* tmp32 = new u32[len+1]; u32* tmp32 = new u32[len+1];
wchar_t* tmp16 = new wchar_t[len+1]; wchar_t* tmp16 = new wchar_t[len+1];
utf8_conv_utf32(tmp32,len+1,str.c_str(),len+1); utf8_conv_utf32(tmp32,len+1,str.c_str(),str.size()+1);
//truncate the utf32 output to utf16. //truncate the utf32 output to utf16.
//I know that's amazingly sloppy, but it should work for us, probably (libretro-common's facilities are underpowered at the present) //I know that's amazingly sloppy, but it should work for us, probably (libretro-common's facilities are underpowered at the present)
@ -307,8 +307,8 @@ std::wstring mbstowcs(std::string str)
std::string wcstombs(std::wstring str) std::string wcstombs(std::wstring str)
{ {
size_t len = str.length(); size_t len = str.length();
char *tmp8 = new char[len+1]; char *tmp8 = new char[len*4+1]; //allow space for string to inflate
utf16_to_char_string((u16*)str.c_str(),tmp8,len+1); utf16_to_char_string((u16*)str.c_str(),tmp8,len*4+1);
std::string ret = tmp8; std::string ret = tmp8;
delete[] tmp8; delete[] tmp8;
return ret; return ret;