From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 27 Jan 2010 18:09:43 +0000 (+0000)
Subject: Merged revisions 243487 via svnmerge from
X-Git-Tag: 1.6.1.15-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2846abcb7e2cd2f87deec449affa871ddba72034;p=thirdparty%2Fasterisk.git

Merged revisions 243487 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r243487 | mmichelson | 2010-01-27 12:08:02 -0600 (Wed, 27 Jan 2010) | 9 lines

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

  ........
    r243486 | mmichelson | 2010-01-27 12:06:43 -0600 (Wed, 27 Jan 2010) | 3 lines

    Use a safe list traversal while checking for duplicate vars in pbx_builtin_setvar_helper.
  ........
................


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

diff --git a/main/pbx.c b/main/pbx.c
index daae9b5713..8f792a5308 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8477,14 +8477,15 @@ void pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const
 			nametail++;
 	}
 
-	AST_LIST_TRAVERSE (headp, newvariable, entries) {
+	AST_LIST_TRAVERSE_SAFE_BEGIN(headp, newvariable, entries) {
 		if (strcasecmp(ast_var_name(newvariable), nametail) == 0) {
 			/* there is already such a variable, delete it */
-			AST_LIST_REMOVE(headp, newvariable, entries);
+			AST_LIST_REMOVE_CURRENT(entries);
 			ast_var_delete(newvariable);
 			break;
 		}
 	}
+	AST_LIST_TRAVERSE_SAFE_END;
 
 	if (value) {
 		if (headp == &globals)