Merged revisions 243258 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Tue, 26 Jan 2010 18:20:55 +0000 (18:20 +0000)
committerJeff Peeler <jpeeler@digium.com>
Tue, 26 Jan 2010 18:20:55 +0000 (18:20 +0000)
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/trunk@243266 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index 0f39510..e698709 100644 (file)
@@ -3534,17 +3534,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.integer == 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.integer);