diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-06-11 18:19:24 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-06-11 18:19:24 +0000 |
| commit | 467c6f5f90c40c0e7e7e8dd2fc3d0f71d106287c (patch) | |
| tree | 078006f677b86a437a77ac44e295a2360bc65346 /main/channel.c | |
| parent | 463934753199be8743409d08cc9365f18286bc39 (diff) | |
Merged revisions 121861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121861 | tilghman | 2008-06-11 13:18:16 -0500 (Wed, 11 Jun 2008) | 3 lines
Make calls to ast_assert() actually test something, so that the error message
printed is not nonsensical (reported by mvanbaak via #asterisk-bugs).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@121867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 3364a175d..1409ef095 100644 --- a/main/channel.c +++ b/main/channel.c @@ -983,7 +983,7 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin) if (((fin->frametype == AST_FRAME_VOICE) && (qlen > 96)) || (qlen > 128)) { if (fin->frametype != AST_FRAME_VOICE) { ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name); - ast_assert(0); + ast_assert(fin->frametype == AST_FRAME_VOICE); } else { ast_debug(1, "Dropping voice to exceptionally long queue on %s\n", chan->name); ast_frfree(f); @@ -1641,7 +1641,7 @@ int ast_hangup(struct ast_channel *chan) ast_log(LOG_WARNING, "Hard hangup called by thread %ld on %s, while fd " "is blocked by thread %ld in procedure %s! Expect a failure\n", (long)pthread_self(), chan->name, (long)chan->blocker, chan->blockproc); - ast_assert(0); + ast_assert(ast_test_flag(chan, AST_FLAG_BLOCKING) == 0); } if (!ast_test_flag(chan, AST_FLAG_ZOMBIE)) { ast_debug(1, "Hanging up channel '%s'\n", chan->name); |