From: Jeff Peeler <jpeeler@digium.com>
Date: Tue, 26 Jan 2010 18:26:09 +0000 (+0000)
Subject: Merged revisions 243266 via svnmerge from
X-Git-Tag: 1.6.1.15-rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=651f62ddc746145607484685a620f4e223dad515;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@243292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index e66b6e0452..10c196e3d6 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);