N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-30 02:32:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

applet_swkbd: Include the null terminator in the buffer size calculation

Browse source 
Some games may interpret the read string as a null-terminated string instead of just reading the string up to buffer_size.
This commit is contained in:
Morph 2021-08-04 22:32:09 -04:00
parent 2868d4ba84
commit f10dc35dd0
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/hle/service/am/applets/applet_software_keyboard.cpp
View file

@ -377,7 +377,8 @@ void SoftwareKeyboard::SubmitForTextCheck(std::u16string submitted_text) {
if (swkbd_config_common.use_utf8) { if (swkbd_config_common.use_utf8) {
std::string utf8_submitted_text = Common::UTF16ToUTF8(current_text); std::string utf8_submitted_text = Common::UTF16ToUTF8(current_text);
const u64 buffer_size = utf8_submitted_text.size(); // Include the null terminator in the buffer size.
const u64 buffer_size = utf8_submitted_text.size() + 1;
LOG_DEBUG(Service_AM, "\nBuffer Size: {}\nUTF-8 Submitted Text: {}", buffer_size, LOG_DEBUG(Service_AM, "\nBuffer Size: {}\nUTF-8 Submitted Text: {}", buffer_size,
utf8_submitted_text); utf8_submitted_text);
@ -386,7 +387,8 @@ void SoftwareKeyboard::SubmitForTextCheck(std::u16string submitted_text) {
std::memcpy(out_data.data() + sizeof(u64), utf8_submitted_text.data(), std::memcpy(out_data.data() + sizeof(u64), utf8_submitted_text.data(),
utf8_submitted_text.size()); utf8_submitted_text.size());
} else { } else {
const u64 buffer_size = current_text.size() * sizeof(char16_t); // Include the null terminator in the buffer size.
const u64 buffer_size = (current_text.size() + 1) * sizeof(char16_t);
LOG_DEBUG(Service_AM, "\nBuffer Size: {}\nUTF-16 Submitted Text: {}", buffer_size, LOG_DEBUG(Service_AM, "\nBuffer Size: {}\nUTF-16 Submitted Text: {}", buffer_size,
Common::UTF16ToUTF8(current_text)); Common::UTF16ToUTF8(current_text));