From 8a41efaf1b745beb69f6a2281de7bdc707d564b4 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Tue, 26 Jan 2010 18:26:59 +0000 Subject: 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.2@243297 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'main') diff --git a/main/channel.c b/main/channel.c index 2a5728754..78a8cad04 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3057,17 +3057,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); -- cgit v1.2.3