[svn-commits] dvossel: trunk r213113 - in /trunk: ./ apps/app_mixmonitor.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Aug 19 16:21:00 2009
New Revision: 213113

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213113
Log:
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:
    trunk/   (props changed)
    trunk/apps/app_mixmonitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_mixmonitor.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=213113&r1=213112&r2=213113
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Wed Aug 19 16:21:00 2009
@@ -404,7 +404,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;
 	}
 
@@ -419,7 +419,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;
 	}