Mirrors/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra synced 2024-11-15 13:18:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Truncating UTF16 text before converting them toUTF8

Browse source
This commit is contained in:
Alexandre LittleWhite Laurent 2018-07-20 19:50:33 +02:00
parent e28c527bfa
commit 578b08c53b
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/hle/applets/swkbd.cpp
View file

@ -148,8 +148,13 @@ Frontend::KeyboardConfig SoftwareKeyboard::ToFrontendConfig(
frontend_config.multiline_mode = config.multiline; frontend_config.multiline_mode = config.multiline;
frontend_config.max_text_length = config.max_text_length; frontend_config.max_text_length = config.max_text_length;
frontend_config.max_digits = config.max_digits; frontend_config.max_digits = config.max_digits;
std::u16string buffer(config.hint_text.size(), 0);
std::memcpy(buffer.data(), config.hint_text.data(), config.hint_text.size() * sizeof(u16)); size_t text_size = config.hint_text.size();
const auto text_end = std::find(config.hint_text.begin(), config.hint_text.end(), u'\0');
if (text_end != config.hint_text.end())
text_size = std::distance(config.hint_text.begin(), text_end);
std::u16string buffer(text_size, 0);
std::memcpy(buffer.data(), config.hint_text.data(), text_size * sizeof(u16));
frontend_config.hint_text = Common::UTF16ToUTF8(buffer); frontend_config.hint_text = Common::UTF16ToUTF8(buffer);
frontend_config.has_custom_button_text = frontend_config.has_custom_button_text =
!std::all_of(config.button_text.begin(), config.button_text.end(), !std::all_of(config.button_text.begin(), config.button_text.end(),
@ -158,8 +163,13 @@ Frontend::KeyboardConfig SoftwareKeyboard::ToFrontendConfig(
}); });
if (frontend_config.has_custom_button_text) { if (frontend_config.has_custom_button_text) {
for (const auto& text : config.button_text) { for (const auto& text : config.button_text) {
buffer.resize(text.size()); text_size = text.size();
std::memcpy(buffer.data(), text.data(), text.size() * sizeof(u16)); const auto text_end = std::find(text.begin(), text.end(), u'\0');
if (text_end != text.end())
text_size = std::distance(text.begin(), text_end);
buffer.resize(text_size);
std::memcpy(buffer.data(), text.data(), text_size * sizeof(u16));
frontend_config.button_text.push_back(Common::UTF16ToUTF8(buffer)); frontend_config.button_text.push_back(Common::UTF16ToUTF8(buffer));
} }
} }