diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-16 20:08:29 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-16 20:08:29 +0000 |
commit | 458631f6f495127265fe27c11f3630f0faa062e4 (patch) | |
tree | d9327700cdf4901d41e8fd4789c48790a4d534a2 /channel.c | |
parent | f98a7f3a64bdbbd52452e0f52bb75efc48e90bba (diff) |
Merged revisions 27468 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r27468 | kpfleming | 2006-05-16 15:05:17 -0500 (Tue, 16 May 2006) | 2 lines
don't leak frames when deferring DTMF or dropping duplicate ANSWER frames (issue #7041, slightly different fix, reported/patched by clausf)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@27477 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1955,9 +1955,11 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) if (f->subclass == AST_CONTROL_ANSWER) { if (!ast_test_flag(chan, AST_FLAG_OUTGOING)) { ast_log(LOG_DEBUG, "Ignoring answer on an inbound call!\n"); + ast_frfree(f); f = &ast_null_frame; } else if (prestate == AST_STATE_UP) { ast_log(LOG_DEBUG, "Dropping duplicate answer!\n"); + ast_frfree(f); f = &ast_null_frame; } else { /* Answer the CDR */ @@ -1973,6 +1975,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) 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 = &ast_null_frame; } break; |