ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-23 14:31:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed infinite loop when SDL_SendKeyboardText() is passed invalid UTF-8 text

Browse source
This commit is contained in:
Sam Lantinga 2022-08-01 09:43:15 -07:00
parent 954bbdf3ae
commit 0cd5b08bfe
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/events/SDL_keyboard.c
View file

@ -914,12 +914,16 @@ SDL_SendKeyboardText(const char *text)
posted = 0; posted = 0;
if (SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE) { if (SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE) {
SDL_Event event; SDL_Event event;
size_t i = 0, length = SDL_strlen(text); size_t pos = 0, advance, length = SDL_strlen(text);
event.text.type = SDL_TEXTINPUT; event.text.type = SDL_TEXTINPUT;
event.text.windowID = keyboard->focus ? keyboard->focus->id : 0; event.text.windowID = keyboard->focus ? keyboard->focus->id : 0;
while (i < length) { while (pos < length) {
i += SDL_utf8strlcpy(event.text.text, text + i, SDL_arraysize(event.text.text)); advance = SDL_utf8strlcpy(event.text.text, text + pos, SDL_arraysize(event.text.text));
if (!advance) {
break;
}
pos += advance;
posted |= (SDL_PushEvent(&event) > 0); posted |= (SDL_PushEvent(&event) > 0);
} }
} }