dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

don't crash on setvar (issue #5760) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7099 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2005-11-15 18:35:30 +00:00
parent 1a9b411b02
commit 4feee61e32
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2005-11-15 Russell Bryant <russell@digium.com>
* manager.c: Don't crash on a SetVar action if the channel name is not set, or variable's value is not set (issue #5760)
* doc/README.variables: Add application exit status variables
2005-11-14 Josh Roberson <josh@asteirasgi.com>

13
manager.c
View File

@ -689,6 +689,11 @@ static int action_setvar(struct mansession *s, struct message *m)
astman_send_error(s, m, "No variable specified");
return 0;
}
if (ast_strlen_zero(varval)) {
astman_send_error(s, m, "No value specified");
return 0;
}
if (!ast_strlen_zero(name)) {
c = ast_get_channel_by_name_locked(name);
@ -698,10 +703,12 @@ static int action_setvar(struct mansession *s, struct message *m)
}
}
pbx_builtin_setvar_helper(c,varname,varval);
pbx_builtin_setvar_helper(c, varname, varval);
ast_mutex_unlock(&c->lock);
astman_send_ack(s, m, "Variable Set");
if (c)
ast_mutex_unlock(&c->lock);
astman_send_ack(s, m, "Variable Set");
return 0;
}