diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-19 21:25:19 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-19 21:25:19 +0000 |
| commit | 3fadc3765eb31247ef00436a7c968c94d9404217 (patch) | |
| tree | 7535cb4d1c797f9112c5c247440e6c8f00244647 /apps | |
| parent | b402d3a0efd53fb2ba52785e47db9d73d444f466 (diff) | |
Merged revisions 213113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r213113 | dvossel | 2009-08-19 16:21:00 -0500 (Wed, 19 Aug 2009) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@213128 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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 0fe0bb0f1..6cb8eed7c 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -420,7 +420,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; } @@ -435,7 +435,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; } |