From 462dda944cc9d5a80f10520b0bd0ab4d69ff942c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 19 Jun 2016 22:30:57 +0200 Subject: [PATCH] (menu_cbs_ok.c) Try to fix second memory leak --- menu/cbs/menu_cbs_ok.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 7c0fefa395..5036f70043 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -744,6 +744,7 @@ static int action_ok_playlist_entry(const char *path, size_t selection; menu_content_ctx_playlist_info_t playlist_info; size_t selection_ptr = 0; + bool playlist_initialized = false; playlist_t *playlist = g_defaults.history; bool is_history = true; const char *entry_path = NULL; @@ -772,6 +773,7 @@ static int action_ok_playlist_entry(const char *path, if (!tmp_playlist) return menu_cbs_exit(); + playlist_initialized = true; } playlist = tmp_playlist; @@ -818,8 +820,13 @@ static int action_ok_playlist_entry(const char *path, found_associated_core = false; if (!found_associated_core) - return action_ok_file_load_with_detect_core(entry_path, + { + int ret = action_ok_file_load_with_detect_core(entry_path, label, type, selection_ptr, entry_idx); + if (playlist_initialized) + playlist_free(tmp_playlist); + return ret; + } menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &tmp_playlist);