[svn-commits] jeang: branch 1.8 r280346 - in /branches/1.8: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: jeang
Date: Thu Jul 29 11:07:16 2010
New Revision: 280346

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280346
Log:
Merged revisions 280345 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r280345 | jeang | 2010-07-29 11:01:35 -0500 (Thu, 29 Jul 2010) | 10 lines
  
  Merged revisions 280341 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r280341 | jeang | 2010-07-29 10:52:31 -0500 (Thu, 29 Jul 2010) | 2 lines
    
    Fix a dsp structure leak occuring when a local channel is put into a meetme
    conference, then masquaraded away.
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_meetme.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Thu Jul 29 11:07:16 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=280346&r1=280345&r2=280346
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Thu Jul 29 11:07:16 2010
@@ -2686,6 +2686,9 @@
 
 	conf_flush(fd, chan);
 
+	if (dsp)
+		ast_dsp_free(dsp);
+
 	if (!(dsp = ast_dsp_new())) {
 		ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
 		res = -1;