[asterisk-commits] dvossel: branch 1.6.0 r213135 - in /branches/1.6.0: ./ apps/app_mixmonitor.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Aug 19 16:27:09 2009
New Revision: 213135

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213135
Log:
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)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_mixmonitor.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_mixmonitor.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/apps/app_mixmonitor.c?view=diff&rev=213135&r1=213134&r2=213135
==============================================================================
--- branches/1.6.0/apps/app_mixmonitor.c (original)
+++ branches/1.6.0/apps/app_mixmonitor.c Wed Aug 19 16:27:09 2009
@@ -371,7 +371,7 @@
 
 	/* 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 @@
 		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;
 	}