[Asterisk-cvs] asterisk/channels chan_zap.c,1.141,1.142

martinp at lists.digium.com martinp at lists.digium.com
Tue Nov 18 11:43:12 CST 2003


Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv14997/channels

Modified Files:
	chan_zap.c 
Log Message:
Fix segfault if more than 32 channels are used because of round_robin[x] = p;


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- chan_zap.c	12 Nov 2003 00:13:22 -0000	1.141
+++ chan_zap.c	18 Nov 2003 18:09:29 -0000	1.142
@@ -5425,6 +5425,7 @@
 	int oldformat;
 	int groupmatch = 0;
 	int channelmatch = -1;
+	int roundrobin = 0;
 	int callwait = 0;
 	struct zt_pvt *p;
 	struct ast_channel *tmp = NULL;
@@ -5476,6 +5477,7 @@
 				if (!p)
 					p = iflist;
 			}
+			roundrobin = 1;
 		}
 	} else {
 		char *stringp=NULL;
@@ -5498,7 +5500,8 @@
 	}
 	exit = p;
 	while(p && !tmp) {
-		round_robin[x] = p;
+		if (roundrobin)
+			round_robin[x] = p;
 #if 0 
 		ast_verbose("name = %s, %d\n",p->owner->name,p->channel);
 #endif




More information about the svn-commits mailing list