From 487ddca70c65de5bfa1f79d725659ff807c22daa Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 26 Dec 2009 12:04:48 +0000 Subject: Free playtree_iter upon exiting MPlayer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30117 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 587b03e920..a30da0f119 100644 --- a/mplayer.c +++ b/mplayer.c @@ -707,6 +707,8 @@ void exit_player_with_rc(exit_reason_t how, int rc){ if(mconfig) m_config_free(mconfig); + if(mpctx->playtree_iter) + play_tree_iter_free(mpctx->playtree_iter); if(mpctx->playtree) play_tree_free(mpctx->playtree, 1); -- cgit v1.2.3 From 3241bdffd6ca7f17a49ca3c2df4737e747e56ea8 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 26 Dec 2009 12:07:14 +0000 Subject: Set some freed pointers to NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30118 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index a30da0f119..ef11a39e4e 100644 --- a/mplayer.c +++ b/mplayer.c @@ -699,6 +699,7 @@ void exit_player_with_rc(exit_reason_t how, int rc){ #ifdef CONFIG_ASS ass_library_done(ass_library); + ass_library = NULL; #endif current_module="exit_player"; @@ -706,14 +707,18 @@ void exit_player_with_rc(exit_reason_t how, int rc){ // free mplayer config if(mconfig) m_config_free(mconfig); + mconfig = NULL; if(mpctx->playtree_iter) play_tree_iter_free(mpctx->playtree_iter); + mpctx->playtree_iter = NULL; if(mpctx->playtree) play_tree_free(mpctx->playtree, 1); + mpctx->playtree = NULL; if(edl_records != NULL) free(edl_records); // free mem allocated for EDL + edl_records = NULL; switch(how) { case EXIT_QUIT: mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ExitingHow,MSGTR_Exit_quit); -- cgit v1.2.3