diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-06-13 21:45:21 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-06-13 21:45:21 +0000 |
| commit | 99ea83bbec6fd15a42661f5ecc1e263db1d2a095 (patch) | |
| tree | 90026b0799eac81d5cb4998998729bc9f6dbe581 /main/autoservice.c | |
| parent | b8b72a22c0ae476b058f8410923dff920dcc484c (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@122714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/autoservice.c')
| -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; |