From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 1 Nov 2006 16:51:26 +0000 (+0000)
Subject: Merged revisions 46744 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190cff59694c382d186de98195975e68fd0da82c;p=thirdparty%2Fasterisk.git

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

........
r46744 | russell | 2006-11-01 11:39:09 -0500 (Wed, 01 Nov 2006) | 2 lines

Prevent an infinite loop when config processing gets to a jitterbuffer option

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f299177fdd..53a7b976b3 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -11656,7 +11656,7 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
 	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;
 
@@ -12320,7 +12320,6 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
 			} 
 		} 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