automerge commit

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

diff --git a/channel.c b/channel.c
index ae4c747e4e1bc9c4f29f5930e443a507e7f43eff..77ad5f34e1cd8bdb1550484677d5479024565468 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -1950,10 +1950,12 @@ struct ast_frame *ast_read(struct ast_channel *chan)
                        chan->dtmfq[strlen(chan->dtmfq)] = f->subclass;
                else
                        ast_log(LOG_WARNING, "Dropping deferred DTMF digits on %s\n", chan->name);
+               ast_frfree(f);
                f = &null_frame;
        } else if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_ANSWER)) {
                if (prestate == AST_STATE_UP) {
                        ast_log(LOG_DEBUG, "Dropping duplicate answer!\n");
+                       ast_frfree(f);
                        f = &null_frame;
                }
                /* Answer the CDR */