diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 18:19:10 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 18:19:10 +0000 |
| commit | a5ef1424b3b0b1e25d1badceed58a2afc2a50123 (patch) | |
| tree | 4a8279954597159d95516668870eb69bc4f9eaf7 /main | |
| parent | 10d86e0a02531840992e475e2d0a1b611958c3e1 (diff) | |
Remove unnecessary code in ast_read as issue 16058 has been fully solved now.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@243258 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/main/channel.c b/main/channel.c index af152fd39..16c099605 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; |