From: Automerge script Date: Tue, 16 May 2006 20:06:30 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.9.1-netsec~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcdf61c4b33b581b91f2e346b31283478e4e784a;p=thirdparty%2Fasterisk.git 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 ae4c747e4e..77ad5f34e1 100644 --- 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 */