mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-25 09:07:18 +02:00
applet_swkbd: Include the null terminator in the buffer size calculation
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:
parent
2868d4ba84
commit
f10dc35dd0
@ -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));
|
||||||
|
Loading…
Reference in New Issue
Block a user