[asterisk-commits] russell: branch 1.6.0 r140818 - in /branches/1.6.0: ./ main/poll.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Sep  3 08:27:14 2008
New Revision: 140818

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140818
Log:
Merged revisions 140817 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r140817 | russell | 2008-09-03 08:26:43 -0500 (Wed, 03 Sep 2008) | 12 lines

Merged revisions 140816 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140816 | russell | 2008-09-03 08:24:35 -0500 (Wed, 03 Sep 2008) | 4 lines

Don't freak out if the poll emulation receives NULL for the pollfds array
(closes issue #13307)
Reported by: jcovert

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/poll.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/poll.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/poll.c?view=diff&rev=140818&r1=140817&r2=140818
==============================================================================
--- branches/1.6.0/main/poll.c (original)
+++ branches/1.6.0/main/poll.c Wed Sep  3 08:27:14 2008
@@ -268,19 +268,19 @@
 	fd_set  except_descs;                        /* exception descs */
 	struct  timeval stime;                       /* select() timeout value */
 	int	    ready_descriptors;                   /* function result */
-	int	    max_fd;                              /* maximum fd value */
+	int	    max_fd = 0;                          /* maximum fd value */
 	struct  timeval *pTimeout;                   /* actually passed */
 
 	FD_ZERO (&read_descs);
 	FD_ZERO (&write_descs);
 	FD_ZERO (&except_descs);
 
-	assert(pArray != (struct pollfd *) NULL);
-
 	/* Map the poll() file descriptor list in the select() data structures. */
 
-	max_fd = map_poll_spec(pArray, n_fds,
-			&read_descs, &write_descs, &except_descs);
+	if (pArray) {
+    	max_fd = map_poll_spec (pArray, n_fds,
+				&read_descs, &write_descs, &except_descs);
+	}
 
 	/* Map the poll() timeout value in the select() timeout structure. */
 	pTimeout = map_timeout(timeout, &stime);