ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent some memory leaks in menu_init

This commit is contained in:
twinaphex 2015-02-12 19:14:10 +01:00
parent 2e651c6ffc
commit 3f46f97abd
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/menu.c
View File

@ -186,11 +186,16 @@ void *menu_init(const void *data)
sizeof(g_settings.menu.driver)); sizeof(g_settings.menu.driver));
if (!(menu->menu_list = (menu_list_t*)menu_list_new())) if (!(menu->menu_list = (menu_list_t*)menu_list_new()))
return NULL; goto error;
g_extern.core_info_current = (core_info_t*)calloc(1, sizeof(core_info_t)); g_extern.core_info_current = (core_info_t*)calloc(1, sizeof(core_info_t));
if (!g_extern.core_info_current)
goto error;
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu->shader = (struct video_shader*)calloc(1, sizeof(struct video_shader)); menu->shader = (struct video_shader*)calloc(1, sizeof(struct video_shader));
if (!menu->shader)
goto error;
#endif #endif
menu->push_start_screen = g_settings.menu_show_start_screen; menu->push_start_screen = g_settings.menu_show_start_screen;
g_settings.menu_show_start_screen = false; g_settings.menu_show_start_screen = false;
@ -200,12 +205,22 @@ void *menu_init(const void *data)
menu->animation = (animation_t*)calloc(1, sizeof(animation_t)); menu->animation = (animation_t*)calloc(1, sizeof(animation_t));
if (!menu->animation) if (!menu->animation)
{ goto error;
free(menu);
return NULL;
}
return menu; return menu;
error:
if (menu->menu_list)
menu_list_free(menu->menu_list);
menu->menu_list = NULL;
if (g_extern.core_info_current)
free(g_extern.core_info_current);
g_extern.core_info_current = NULL;
if (menu->shader)
free(menu->shader);
menu->shader = NULL;
if (menu)
free(menu);
return NULL;
} }
/** /**