From ca80f13b2befcd04687ed9c6031deae4c7db4b69 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 9 Aug 2017 02:42:19 +0200 Subject: [PATCH] Try to be somewhat safer here in case of null pointer derefences --- input/drivers/wiiu_input.c | 2 +- input/input_remapping.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/input/drivers/wiiu_input.c b/input/drivers/wiiu_input.c index dcf19bbc2e..af1a8b7f76 100644 --- a/input/drivers/wiiu_input.c +++ b/input/drivers/wiiu_input.c @@ -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(); } diff --git a/input/input_remapping.c b/input/input_remapping.c index 4f1924a3e3..6ca86e7270 100644 --- a/input/input_remapping.c +++ b/input/input_remapping.c @@ -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;