[asterisk-commits] jeang: branch 1.6.2 r280345 - in /branches/1.6.2: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jeang
Date: Thu Jul 29 11:01:35 2010
New Revision: 280345

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280345
Log:
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.6.2/   (props changed)
    branches/1.6.2/apps/app_meetme.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Jul 29 11:01:35 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088
+/branches/1.4:1-279056,279206,279945,280088,280341

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=280345&r1=280344&r2=280345
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Thu Jul 29 11:01:35 2010
@@ -2526,6 +2526,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;