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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@91890 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/dsp.c b/main/dsp.c
index f72759d0720e5443310c7649fada0f9864f950fd..4ec1a826566cffa531b744c6eea68a5dec034bb2 100644 (file)
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -1485,6 +1485,7 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
        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 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
                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;
        }