diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-20 16:26:24 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-20 16:26:24 +0000 |
| commit | 693c6deccfe68467107b66b0d8e34af902ae870d (patch) | |
| tree | 63b98e0af2c4ae01a03b3f8fe4c3a4dc7ff7f4a7 /main/channel.c | |
| parent | 7ee60c2cac6398310e9f83d7139c1e24c64685b7 (diff) | |
Only do the chan->fdno check in ast_read() in a developer build.
I changed this check to only happen in a dev-mode build. I also added a
comment explaining what is going on. I also made it so that detection of
this situation does not affect ast_read() operation.
(closes issue #14723)
Reported by: seadweller
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@207360 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/main/channel.c b/main/channel.c index 67aa76636..f548d0e6b 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2080,17 +2080,20 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) goto done; } - if (chan->fdno == -1) { #ifdef AST_DEVMODE + /* + * The ast_waitfor() code records which of the channel's file descriptors reported that + * data is available. In theory, ast_read() should only be called after ast_waitfor() + * reports that a channel has data available for reading. However, there still may be + * some edge cases throughout the code where ast_read() is called improperly. This can + * potentially cause problems, so if this is a developer build, make a lot of noise if + * this happens so that it can be addressed. + */ + if (chan->fdno == -1) { ast_log(LOG_ERROR, "ast_read() called with no recorded file descriptor.\n"); -#else - if (option_debug > 1) { - ast_log(LOG_DEBUG, "ast_read() called with no recorded file descriptor.\n"); - } -#endif - f = &ast_null_frame; - goto done; } +#endif + prestate = chan->_state; /* Read and ignore anything on the alertpipe, but read only |