ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 07:35:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we include the null terminator in XLookupStringAsUTF8()

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/6728

(cherry picked from commit 4106697774ff533b2eeb223f87103fa464fc598a)
This commit is contained in:
Sam Lantinga 2023-11-07 16:24:08 -08:00
parent fb92d150d9
commit 70adacf08a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video/x11/SDL_x11events.c
View file

@ -756,7 +756,7 @@ static int XLookupStringAsUTF8(XKeyEvent *event_struct, char *buffer_return, int
{ {
int result = X11_XLookupString(event_struct, buffer_return, bytes_buffer, keysym_return, status_in_out); int result = X11_XLookupString(event_struct, buffer_return, bytes_buffer, keysym_return, status_in_out);
if (IsHighLatin1(buffer_return, result)) { if (IsHighLatin1(buffer_return, result)) {
char *utf8_text = SDL_iconv_string("UTF-8", "ISO-8859-1", buffer_return, result); char *utf8_text = SDL_iconv_string("UTF-8", "ISO-8859-1", buffer_return, result + 1);
if (utf8_text) { if (utf8_text) {
SDL_strlcpy(buffer_return, utf8_text, bytes_buffer); SDL_strlcpy(buffer_return, utf8_text, bytes_buffer);
SDL_free(utf8_text); SDL_free(utf8_text);