[asterisk-commits] jeang: trunk r280416 - in /trunk: ./ apps/app_meetme.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jul 29 11:47:26 CDT 2010


Author: jeang
Date: Thu Jul 29 11:47:23 2010
New Revision: 280416

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

................
  r280346 | jeang | 2010-07-29 11:07:16 -0500 (Thu, 29 Jul 2010) | 17 lines
  
  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:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

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

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=280416&r1=280415&r2=280416
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Jul 29 11:47:23 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;




More information about the asterisk-commits mailing list