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

diff --git a/main/channel.c b/main/channel.c
index af152fd396a6c232541ee773c611bf261d0329f0..16c0996050ccd578129d1be1efcdfcf178ce6e5b 100644 (file)
--- 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;