Merged revisions 189277 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r189277 | mmichelson | 2009-04-20 09:04:41 -0500 (Mon, 20 Apr 2009) | 12 lines

  Move the check for chan->fdno == -1 to after the zombie/hangup check.

  Many users were finding that their hung up channels were staying up and
  causing 100% CPU usage.

  (issue #14723)
  Reported by: seadweller
  Patches:
        14723_1-4-tip.patch uploaded by mmichelson (license 60)
  Tested by: falves11, bamby
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@189278 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index ed88f53f457742d8465274a1cb7b4ab5286f237e..7325bea24f78f4aa0cca7b8d1848eba51abdfedc 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -2842,6 +2842,13 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                goto done;
        }
 
+       /* Stop if we're a zombie or need a soft hangup */
+       if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
+               if (chan->generator)
+                       ast_deactivate_generator(chan);
+               goto done;
+       }
+
        if (chan->fdno == -1) {
 #ifdef AST_DEVMODE
                ast_log(LOG_ERROR, "ast_read() called with no recorded file descriptor.\n");
@@ -2851,13 +2858,6 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                f = &ast_null_frame;
                goto done;
        }
-
-       /* Stop if we're a zombie or need a soft hangup */
-       if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
-               if (chan->generator)
-                       ast_deactivate_generator(chan);
-               goto done;
-       }
        prestate = chan->_state;
 
        /* Read and ignore anything on the alertpipe, but read only