mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to be somewhat safer here in case of null pointer derefences

Browse Source
This commit is contained in:
twinaphex 2017-08-09 02:42:19 +02:00
parent 3a5a2d9de6
commit ca80f13b2b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/drivers/wiiu_input.c
View File

@ -100,7 +100,7 @@ static void wiiu_input_poll(void *data)
{
wiiu_input_t *wiiu = (wiiu_input_t*)data;
if (wiiu->joypad)
if (wiiu && wiiu->joypad)
wiiu->joypad->poll();
}

5
input/input_remapping.c
View File

@ -208,8 +208,9 @@ void input_remapping_set_defaults(void)
{
for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++)
{
const struct retro_keybind *keybind = &input_config_binds[i][j];
settings->uints.input_remap_ids[i][j] = keybind->id;
const struct retro_keybind *keybind = &input_config_binds[i][j];
if (keybind)
settings->uints.input_remap_ids[i][j] = keybind->id;
}
for (j = 0; j < 4; j++)
settings->uints.input_remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = j;