libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

input_keyboard_event(): Add NULL check (prevents potential segfault when input remaps are disabled)

Browse Source
This commit is contained in:
jdgleaver 2021-02-18 11:01:27 +00:00
parent 06b77bab18
commit 4b70fbcd86
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroarch.c
View File

@ -25709,19 +25709,19 @@ void input_keyboard_event(bool down, unsigned code,
else else
{ {
retro_keyboard_event_t *key_event = &p_rarch->runloop_key_event; retro_keyboard_event_t *key_event = &p_rarch->runloop_key_event;
input_mapper_t *handle = p_rarch->input_driver_mapper;
bool block = false; bool block = false;
if (code == RETROK_UNKNOWN || if ((code == RETROK_UNKNOWN) || !key_event)
key_event == NULL)
return; return;
/* Block hotkey+RetroPad mapped keyboard key events, /* Block hotkey+RetroPad mapped keyboard key events,
* but not with game focus and from keyboard device type */ * but not with game focus and from keyboard device type */
if (!p_rarch->game_focus_state.enabled) if (!p_rarch->game_focus_state.enabled)
{ {
input_mapper_t *handle = p_rarch->input_driver_mapper;
block = BIT512_GET(p_rarch->keyboard_mapping_bits, code); block = BIT512_GET(p_rarch->keyboard_mapping_bits, code);
if (block && MAPPER_GET_KEY(handle, code)) if (block && handle && MAPPER_GET_KEY(handle, code))
block = false; block = false;
} }