From 3d0314d5c08de7af47ed86258c7dd08452ee1486 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Wed, 19 Aug 2009 21:21:00 +0000 Subject: [PATCH] Merged revisions 213103 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r213103 | dvossel | 2009-08-19 16:18:37 -0500 (Wed, 19 Aug 2009) | 8 lines Fixes memory leak caused by incorrectly freeing mixmonitor (closes issue #15699) Reported by: edantie Patches: mixmonitor.patch uploaded by edantie (license 862) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@213113 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_mixmonitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 7c1782bd41..45b2da913d 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -404,7 +404,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename /* Setup the actual spy before creating our thread */ if (ast_audiohook_init(&mixmonitor->audiohook, AST_AUDIOHOOK_TYPE_SPY, mixmonitor_spy_type)) { - ast_free(mixmonitor); + mixmonitor_free(mixmonitor); return; } @@ -419,7 +419,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename ast_log(LOG_WARNING, "Unable to add '%s' spy to channel '%s'\n", mixmonitor_spy_type, chan->name); ast_audiohook_destroy(&mixmonitor->audiohook); - ast_free(mixmonitor); + mixmonitor_free(mixmonitor); return; }