Merged revisions 46744 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 1 Nov 2006 16:51:26 +0000 (16:51 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 1 Nov 2006 16:51:26 +0000 (16:51 +0000)
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

channels/chan_zap.c

index f299177..53a7b97 100644 (file)
@@ -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