diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-13 21:47:53 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-13 21:47:53 +0000 |
| commit | 30e13b7ed729412f40e080bd6a308e032af5cf93 (patch) | |
| tree | 1ab8d10486ff1e3a2dc64c88a3f01cbf8003bca0 /main | |
| parent | 0fa1f509f9e1642e685527fd7c759193c412a905 (diff) | |
Merged revisions 122714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r122714 | mmichelson | 2008-06-13 16:45:21 -0500 (Fri, 13 Jun 2008) | 17 lines
Merged revisions 122713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122713 | mmichelson | 2008-06-13 16:44:53 -0500 (Fri, 13 Jun 2008) | 9 lines
Short circuit the loop in autoservice_run if there are no channels to poll.
If we continued, then the result would be calling poll() with a NULL
pollfd array. While this is fine with POSIX's poll(2) system call, those
who use Asterisk's internal poll mechanism (Darwin systems) would have
a failed assertion occur when poll is called.
(related to issue #10342)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122715 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/autoservice.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/autoservice.c b/main/autoservice.c index 636e95dd3..1f18dee25 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -101,6 +101,10 @@ static void *autoservice_run(void *ign) AST_LIST_UNLOCK(&aslist); + if (!x) { + continue; + } + chan = ast_waitfor_n(mons, x, &ms); if (!chan) { continue; |