From bc61ceb338d719ff2dc592c0f9c2c9b42933b176 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 29 Jun 2020 19:54:27 +0200 Subject: [PATCH] (retroarch.c) Prevent dereference of NULL pointer --- retroarch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/retroarch.c b/retroarch.c index 6788e44902..6737ba429b 100644 --- a/retroarch.c +++ b/retroarch.c @@ -3490,11 +3490,13 @@ static void menu_input_key_bind_poll_bind_state( input_driver_t *input_ptr = p_rarch->current_input; void *input_data = p_rarch->current_input_data; unsigned port = state->port; - const input_device_driver_t *joypad = - p_rarch->current_input->get_joypad_driver(p_rarch->current_input_data); + const input_device_driver_t *joypad = NULL; const input_device_driver_t *sec_joypad = input_driver_get_sec_joypad_driver(); + if (p_rarch->current_input->get_joypad_driver) + joypad = p_rarch->current_input->get_joypad_driver(p_rarch->current_input_data); + memset(state->state, 0, sizeof(state->state)); /* poll mouse (on the relevant port) */