From 6ef5232f3270e7647ad1ce5c2e006a59cb837b0a Mon Sep 17 00:00:00 2001 From: Dwedit Date: Mon, 28 May 2018 09:37:43 -0500 Subject: [PATCH] Fix null pointer read in `action_bind_sublabel_subsystem_add` --- menu/cbs/menu_cbs_sublabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 6cd136b960..a8c8bae35d 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -448,7 +448,7 @@ static int action_bind_sublabel_subsystem_add( char *s, size_t len) { rarch_system_info_t *system = runloop_get_system_info(); - const struct retro_subsystem_info *subsystem = system ? + const struct retro_subsystem_info *subsystem = (system && system->subsystem.data) ? system->subsystem.data + (type - MENU_SETTINGS_SUBSYSTEM_ADD) : NULL; if (subsystem && content_get_subsystem_rom_id() < subsystem->num_roms)