From 7d8f9a349890888e2e4cfc14bb58c09c8c644bdf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 29 Mar 2015 00:33:38 +0100 Subject: [PATCH] (menu_entries.c) Fix potential crash --- menu/menu_entries.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 90986da664..915c93cc06 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -88,7 +88,9 @@ int menu_entries_push_list(menu_handle_t *menu, rarch_setting_t *setting = NULL; settings_t *settings = config_get_ptr(); - settings_list_free(menu->list_settings); + if (menu && menu->list_settings) + settings_list_free(menu->list_settings); + menu->list_settings = (rarch_setting_t *)setting_new(setting_flags); if (!(setting = (rarch_setting_t*)menu_setting_find(label)))