Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDLControllerInterface: Prevent crash with out-of-range buttons

Browse source
This commit is contained in:
Connor McLaughlin 2021-05-07 21:07:04 +10:00
parent e5a6103f74
commit 8a39969a61
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/frontend-common/sdl_controller_interface.cpp
View file

@ -629,6 +629,9 @@ bool SDLControllerInterface::HandleControllerAxisEvent(const SDL_ControllerAxisE
if (DoEventHook(Hook::Type::Axis, it->player_id, ev->axis, value)) if (DoEventHook(Hook::Type::Axis, it->player_id, ev->axis, value))
return true; return true;
if (ev->axis >= MAX_NUM_AXES)
return false;
const AxisCallback& cb = it->axis_mapping[ev->axis][AxisSide::Full]; const AxisCallback& cb = it->axis_mapping[ev->axis][AxisSide::Full];
if (cb) if (cb)
{ {
@ -707,6 +710,9 @@ bool SDLControllerInterface::HandleControllerButtonEvent(const SDL_ControllerBut
return true; return true;
} }
if (ev->button >= MAX_NUM_BUTTONS)
return false;
const ButtonCallback& cb = it->button_mapping[ev->button]; const ButtonCallback& cb = it->button_mapping[ev->button];
if (cb) if (cb)
{ {