[svn-commits] mmichelson: branch 1.4 r122713 - /branches/1.4/main/autoservice.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jun 13 16:44:53 2008
New Revision: 122713

URL: http://svn.digium.com/view/asterisk?view=rev&rev=122713
Log:
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)


Modified:
    branches/1.4/main/autoservice.c

Modified: branches/1.4/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/autoservice.c?view=diff&rev=122713&r1=122712&r2=122713
==============================================================================
--- branches/1.4/main/autoservice.c (original)
+++ branches/1.4/main/autoservice.c Fri Jun 13 16:44:53 2008
@@ -106,6 +106,10 @@
 
 		AST_LIST_UNLOCK(&aslist);
 
+		if (!x) {
+			continue;
+		}
+
 		chan = ast_waitfor_n(mons, x, &ms);
 		if (!chan) {
 			continue;