]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Prevent an infinite loop when config processing gets to a jitterbuffer option
authorRussell Bryant <russell@russellbryant.com>
Wed, 1 Nov 2006 16:39:09 +0000 (16:39 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 1 Nov 2006 16:39:09 +0000 (16:39 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46744 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_zap.c

index e23b5ddde52267afd85841c2517835de96462469..7ee77465665ac19a16a5aa883baf029f7d86b875 100644 (file)
@@ -10419,7 +10419,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;
 
@@ -11042,7 +11042,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