[asterisk-commits] qwell: branch 1.4 r91890 - /branches/1.4/main/dsp.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Dec  7 17:29:01 2007
New Revision: 91890

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91890
Log:
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:
    branches/1.4/main/dsp.c

Modified: branches/1.4/main/dsp.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/dsp.c?view=diff&rev=91890&r1=91889&r2=91890
==============================================================================
--- branches/1.4/main/dsp.c (original)
+++ branches/1.4/main/dsp.c Fri Dec  7 17:29:01 2007
@@ -1485,6 +1485,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)) {
@@ -1492,6 +1493,7 @@
 		memset(&dsp->f, 0, sizeof(dsp->f));
 		dsp->f.frametype = AST_FRAME_CONTROL;
 		dsp->f.subclass = AST_CONTROL_BUSY;
+		ast_frfree(af);
 		ast_log(LOG_DEBUG, "Requesting Hangup because the busy tone was detected on channel %s\n", chan->name);
 		return &dsp->f;
 	}