[asterisk-commits] russell: trunk r46745 - in /trunk: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Nov  1 10:51:26 2006
New Revision: 46745

URL: http://svn.digium.com/view/asterisk?rev=46745&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=46745&r1=46744&r2=46745&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Nov  1 10:51:26 2006
@@ -11656,7 +11656,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;
 
@@ -12320,7 +12320,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