Remove the file descriptors from the main poll channel when the channel is hung up...
authorJoshua Colp <jcolp@digium.com>
Mon, 3 Dec 2007 14:14:43 +0000 (14:14 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 3 Dec 2007 14:14:43 +0000 (14:14 +0000)
(closes issue #11441)
Reported by: blitzrage

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

apps/app_dial.c

index 265b49b..a071f5e 100644 (file)
@@ -646,6 +646,9 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                        f = ast_read(winner);
                        if (!f) {
                                in->hangupcause = c->hangupcause;
+#ifdef HAVE_EPOLL
+                               ast_poll_channel_del(in, c);
+#endif
                                ast_hangup(c);
                                c = o->chan = NULL;
                                ast_clear_flag64(o, DIAL_STILLGOING);
@@ -852,8 +855,10 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
        }
        
 #ifdef HAVE_EPOLL
-       for (epollo = outgoing; epollo; epollo = epollo->next)
-               ast_poll_channel_del(in, epollo->chan);
+       for (epollo = outgoing; epollo; epollo = epollo->next) {
+               if (epollo->chan)
+                       ast_poll_channel_del(in, epollo->chan);
+       }
 #endif
 
        return peer;