diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-19 21:27:09 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-19 21:27:09 +0000 |
| commit | dbf41704ec69bc67d2a6933e152f6d8670c09590 (patch) | |
| tree | 0999c6cf5f7c1b8bf5f621f48e101027c91c5e8f /apps | |
| parent | 40ddc4abbe720723627238a3ac2aa94f5869a866 (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.0@213135 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 09824c501..e78cb1b7f 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -371,7 +371,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; } @@ -386,7 +386,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; } |