OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-22 12:00:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

U8toU16 now respects buffer sizes

Browse Source
This commit is contained in:
CPunch
2020-10-04 12:50:58 -05:00
parent 5015e2575d
commit 755bb75306
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@@ -131,12 +131,15 @@ std::string U16toU8(char16_t* src) {
}
// returns number of char16_t that was written at des
size_t U8toU16(std::string src, char16_t* des) {
size_t U8toU16(std::string src, char16_t* des, size_t max) {
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>,char16_t> convert;
std::u16string tmp = convert.from_bytes(src);
// copy utf16 string to buffer
memcpy(des, tmp.c_str(), sizeof(char16_t) * tmp.length());
if (sizeof(char16_t) * tmp.length() > max) // make sure we don't write outside the buffer
memcpy(des, tmp.c_str(), sizeof(char16_t) * max);
else
memcpy(des, tmp.c_str(), sizeof(char16_t) * tmp.length());
des[tmp.length()] = '\0';
return tmp.length();