[asterisk-commits] qwell: trunk r91891 - in /trunk: ./ main/dsp.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Dec  7 17:32:09 2007
New Revision: 91891

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91891
Log:
Merged revisions 91890 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11273)
........
r91890 | qwell | 2007-12-07 17:29:01 -0600 (Fri, 07 Dec 2007) | 4 lines

We need to make sure we free the input frame if we return a different frame in ast_dsp_process.

Issue 11273, pointed out by dimas, with a patch by eliel.

........

Modified:
    trunk/   (props changed)
    trunk/main/dsp.c

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

Modified: trunk/main/dsp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dsp.c?view=diff&rev=91891&r1=91890&r2=91891
==============================================================================
--- trunk/main/dsp.c (original)
+++ trunk/main/dsp.c Fri Dec  7 17:32:09 2007
@@ -1114,6 +1114,7 @@
 	if ((dsp->features & DSP_FEATURE_SILENCE_SUPPRESS) && silence) {
 		memset(&dsp->f, 0, sizeof(dsp->f));
 		dsp->f.frametype = AST_FRAME_NULL;
+		ast_frfree(af);
 		return &dsp->f;
 	}
 	if ((dsp->features & DSP_FEATURE_BUSY_DETECT) && ast_dsp_busydetect(dsp)) {
@@ -1121,6 +1122,7 @@
 		memset(&dsp->f, 0, sizeof(dsp->f));
 		dsp->f.frametype = AST_FRAME_CONTROL;
 		dsp->f.subclass = AST_CONTROL_BUSY;
+		ast_frfree(af);
 		ast_debug(1, "Requesting Hangup because the busy tone was detected on channel %s\n", chan->name);
 		return &dsp->f;
 	}