From b024a9452dd6232513bf6e8de0d62c19bb90fc93 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 26 Jan 2010 18:19:10 +0000 Subject: [PATCH] Remove unnecessary code in ast_read as issue 16058 has been fully solved now. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@243258 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/main/channel.c b/main/channel.c index af152fd396..16c0996050 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2531,19 +2531,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) { - /* fix invalid pointer */ - f->data = 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 - if (option_debug > 2) { - ast_log(LOG_DEBUG, "Found HOLD frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name); - } -#endif - } - done: ast_channel_unlock(chan); return f; -- 2.47.3