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.0@243286 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 6f2532885572f5c2009fc9131ebcda657b2be862..0da2752e6bc6fc45edb52ba227b85be48ad61e78 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3037,17 +3037,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
-               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);