Browse Source
Merge pull request #6819 from Morph1984/i-am-dumb
applet_swkbd: Include the null terminator in the buffer size calculation
pull/15/merge
Mai M
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
2 deletions
-
src/core/hle/service/am/applets/applet_software_keyboard.cpp
|
|
|
@ -377,7 +377,8 @@ void SoftwareKeyboard::SubmitForTextCheck(std::u16string submitted_text) { |
|
|
|
|
|
|
|
if (swkbd_config_common.use_utf8) { |
|
|
|
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, |
|
|
|
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(), |
|
|
|
utf8_submitted_text.size()); |
|
|
|
} 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, |
|
|
|
Common::UTF16ToUTF8(current_text)); |
|
|
|
|