OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-14 02:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix U16toU8() returning strings longer than max

Browse Source 
UTF-16 inputs containing actual multi-byte characters resulted in codecvt
returning a UTF-8 string longer than the requested max length.
This commit is contained in:
dongresource 2021-10-25 21:05:49 +02:00
parent 70c3650ee1
commit 57e9834786
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@ -155,7 +155,12 @@ std::string U16toU8(char16_t* src, size_t max) {
src[max-1] = '\0'; // force a NULL terminatorstd::string U16toU8(char16_t* src) { src[max-1] = '\0'; // force a NULL terminatorstd::string U16toU8(char16_t* src) {
try { try {
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>,char16_t> convert; std::wstring_convert<std::codecvt_utf8_utf16<char16_t>,char16_t> convert;
return convert.to_bytes(src); std::string ret = convert.to_bytes(src);
if (ret.size() >= max)
ret.resize(max-2);
return ret;
} catch(const std::exception& e) { } catch(const std::exception& e) {
return ""; return "";
} }