[asterisk-commits] jpeeler: branch group/multiparking r112556 - /team/group/multiparking/main/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Apr  2 18:20:55 2008
New Revision: 112556

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112556
Log:
split up if conditional to stop another segfault

Modified:
    team/group/multiparking/main/features.c

Modified: team/group/multiparking/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/main/features.c?view=diff&rev=112556&r1=112555&r2=112556
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Wed Apr  2 18:20:55 2008
@@ -2358,7 +2358,17 @@
 			for (x = 0; x < AST_MAX_FDS; x++) {
 				struct ast_frame *f;
 
-				if ((chan->fds[x] == -1) && (!FD_ISSET(chan->fds[x], rfds) && !FD_ISSET(pu->chan->fds[x], efds))) 
+				/*if ((chan->fds[x] == -1) && (!FD_ISSET(chan->fds[x], rfds) && !FD_ISSET(pu->chan->fds[x], efds))) 
+					continue;
+				*/
+				/* TODO: not sure why splitting this up stops a segfault */
+				if (chan->fds[x] == -1) 
+					continue;
+
+				if (!FD_ISSET(chan->fds[x], rfds))
+					continue;
+
+				if (!FD_ISSET(pu->chan->fds[x], efds))
 					continue;
 
 				if (FD_ISSET(chan->fds[x], efds))