mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-08 19:08:14 +00:00
Setting variables should NOT overwrite prefixed (sorry! revert of 5444)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
10
pbx.c
10
pbx.c
@@ -5885,22 +5885,14 @@ void pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const
|
|||||||
{
|
{
|
||||||
struct ast_var_t *newvariable;
|
struct ast_var_t *newvariable;
|
||||||
struct varshead *headp;
|
struct varshead *headp;
|
||||||
const char *nametail = name;
|
|
||||||
|
|
||||||
if (name[strlen(name)-1] == ')')
|
if (name[strlen(name)-1] == ')')
|
||||||
return ast_func_write(chan, name, value);
|
return ast_func_write(chan, name, value);
|
||||||
|
|
||||||
headp = (chan) ? &chan->varshead : &globals;
|
headp = (chan) ? &chan->varshead : &globals;
|
||||||
|
|
||||||
/* For comparison purposes, we have to strip leading underscores */
|
|
||||||
if (*nametail == '_') {
|
|
||||||
nametail++;
|
|
||||||
if (*nametail == '_')
|
|
||||||
nametail++;
|
|
||||||
}
|
|
||||||
|
|
||||||
AST_LIST_TRAVERSE (headp, newvariable, entries) {
|
AST_LIST_TRAVERSE (headp, newvariable, entries) {
|
||||||
if (strcasecmp(ast_var_name(newvariable), nametail) == 0) {
|
if (strcasecmp(ast_var_name(newvariable), name) == 0) {
|
||||||
/* there is already such a variable, delete it */
|
/* there is already such a variable, delete it */
|
||||||
AST_LIST_REMOVE(headp, newvariable, entries);
|
AST_LIST_REMOVE(headp, newvariable, entries);
|
||||||
ast_var_delete(newvariable);
|
ast_var_delete(newvariable);
|
||||||
|
|||||||
Reference in New Issue
Block a user