diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 18:26:09 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 18:26:09 +0000 |
| commit | c65138f60ddbc9c28de0629c000fdd3172dc779a (patch) | |
| tree | c0c8c531f48efb63059dc782904f00a1959cc6b6 | |
| parent | e5afa7657c1dd01c941696500f23f9e5a77b0697 (diff) | |
Merged revisions 243266 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r243266 | jpeeler | 2010-01-26 12:20:55 -0600 (Tue, 26 Jan 2010) | 9 lines
Merged revisions 243258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r243258 | jpeeler | 2010-01-26 12:19:10 -0600 (Tue, 26 Jan 2010) | 2 lines
Remove unnecessary code in ast_read as issue 16058 has been fully solved now.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243292 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/main/channel.c b/main/channel.c index e66b6e045..10c196e3d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3030,17 +3030,6 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) ast_frame_dump(chan->name, f, "<<"); chan->fin = FRAMECOUNT_INC(chan->fin); - if (f && f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HOLD && f->datalen == 0 && f->data.ptr) { - /* fix invalid pointer */ - f->data.ptr = NULL; -#ifdef AST_DEVMODE - ast_log(LOG_ERROR, "Found HOLD frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name); - ast_frame_dump(chan->name, f, "<<"); -#else - ast_debug(3, "Found HOLD frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name); -#endif - } - done: if (chan->music_state && chan->generator && chan->generator->digit && f && f->frametype == AST_FRAME_DTMF_END) chan->generator->digit(chan, f->subclass); |