diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-27 18:08:51 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-27 18:08:51 +0000 |
| commit | d8dc91129c3a1020d689ace97108f84ac4e025bc (patch) | |
| tree | f7057239098cef794002b317a9c9f13c48784b38 | |
| parent | 7f7038715d16e14fa9c8beb2f60c1081e572da3e (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@243488 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/pbx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c index d86d44df3..eb2aba10a 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -8157,14 +8157,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) |