[asterisk-commits] russell: branch 1.4 r46744 - /branches/1.4/channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Nov  1 10:39:09 2006
New Revision: 46744

URL: http://svn.digium.com/view/asterisk?rev=46744&view=rev
Log:
Prevent an infinite loop when config processing gets to a jitterbuffer option

Modified:
    branches/1.4/channels/chan_zap.c

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?rev=46744&r1=46743&r2=46744&view=diff
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Wed Nov  1 10:39:09 2006
@@ -10419,7 +10419,7 @@
 	int y;
 	int found_pseudo = 0;
 
-	while(v) {
+	for (; v; v = v->next) {
 		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
 			continue;
 
@@ -11042,7 +11042,6 @@
 			} 
 		} else if (!skipchannels)
 			ast_log(LOG_WARNING, "Ignoring %s\n", v->name);
-		v = v->next;
 	}
 	if (!found_pseudo && reload == 0) {
 		/* Make sure pseudo isn't a member of any groups if