Fixed bug 3438 - SDL_GameControllerEventWatcher: Log on event with value >= k_nMaxReverseEntries

This commit is contained in:
Sam Lantinga 2016-10-07 18:24:34 -07:00
parent 752931d85e
commit 89abbbfe9e
1 changed files with 10 additions and 2 deletions

View File

@ -145,7 +145,11 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event)
{ {
SDL_GameController *controllerlist; SDL_GameController *controllerlist;
if (event->jaxis.axis >= k_nMaxReverseEntries) break; if (event->jaxis.axis >= k_nMaxReverseEntries)
{
SDL_SetError("SDL_GameControllerEventWatcher: Axis index %d too large, ignoring motion", (int)event->jaxis.axis);
break;
}
controllerlist = SDL_gamecontrollers; controllerlist = SDL_gamecontrollers;
while (controllerlist) { while (controllerlist) {
@ -176,7 +180,11 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event)
{ {
SDL_GameController *controllerlist; SDL_GameController *controllerlist;
if (event->jbutton.button >= k_nMaxReverseEntries) break; if (event->jbutton.button >= k_nMaxReverseEntries)
{
SDL_SetError("SDL_GameControllerEventWatcher: Button index %d too large, ignoring update", (int)event->jbutton.button);
break;
}
controllerlist = SDL_gamecontrollers; controllerlist = SDL_gamecontrollers;
while (controllerlist) { while (controllerlist) {