mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 16:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(dynamic.c) Prevent null pointer dereferences

Browse Source
This commit is contained in:
twinaphex 2016-07-12 21:03:24 +02:00
parent e3c4388f76
commit aa9dcc2a8e
1 changed files with 79 additions and 76 deletions

7
dynamic.c

@ -940,8 +940,6 @@ bool rarch_environment_cb(unsigned cmd, void *data)
case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS:
{
unsigned retro_id;
const struct retro_input_descriptor *desc = NULL;
static const char *libretro_btn_desc[] = {
"B (bottom)", "Y (left)", "Select", "Start",
"D-Pad Up", "D-Pad Down", "D-Pad Left", "D-Pad Right",
@ -949,6 +947,10 @@ bool rarch_environment_cb(unsigned cmd, void *data)
"L", "R", "L2", "R2", "L3", "R3",
};
if (system)
{
unsigned retro_id;
const struct retro_input_descriptor *desc = NULL;
memset(&system->input_desc_btn, 0,
sizeof(system->input_desc_btn));
@ -1032,6 +1034,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
}
core_set_input_descriptors();
}
break;
}