kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 213113 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@213132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-08-19 21:26:14 +00:00
parent 8be21262e9
commit da1425c3fd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_mixmonitor.c
View File

@@ -371,7 +371,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename
/* Setup the actual spy before creating our thread */ /* Setup the actual spy before creating our thread */
if (ast_audiohook_init(&mixmonitor->audiohook, AST_AUDIOHOOK_TYPE_SPY, mixmonitor_spy_type)) { if (ast_audiohook_init(&mixmonitor->audiohook, AST_AUDIOHOOK_TYPE_SPY, mixmonitor_spy_type)) {
ast_free(mixmonitor); mixmonitor_free(mixmonitor);
return; 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", ast_log(LOG_WARNING, "Unable to add '%s' spy to channel '%s'\n",
mixmonitor_spy_type, chan->name); mixmonitor_spy_type, chan->name);
ast_audiohook_destroy(&mixmonitor->audiohook); ast_audiohook_destroy(&mixmonitor->audiohook);
ast_free(mixmonitor); mixmonitor_free(mixmonitor);
return; return;
} }