diff options
| author | David Vossel <dvossel@digium.com> | 2009-08-19 21:21:00 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-08-19 21:21:00 +0000 |
| commit | 3d0314d5c08de7af47ed86258c7dd08452ee1486 (patch) | |
| tree | 1aa5d2c9e1c9f371505ef0b9690d3f8091d95b9f /apps/app_mixmonitor.c | |
| parent | 3028e257bb279c7fc4e01f3342efb459e93df4d1 (diff) | |
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
Diffstat (limited to 'apps/app_mixmonitor.c')
| -rw-r--r-- | apps/app_mixmonitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 7c1782bd4..45b2da913 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; } |