diff options
author | Russell Bryant <russell@russellbryant.com> | 2005-11-15 18:35:30 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2005-11-15 18:35:30 +0000 |
commit | 685e88645fb6b3ec6447c5e5870d07d5e5cbd43a (patch) | |
tree | 9cab89d82ce0b3bc74250bd8f03c9c76e0ce8076 | |
parent | 2a53a89aa611f51ad0a7f6de7d22ced1feea30f2 (diff) |
don't crash on setvar (issue #5760)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | ChangeLog | 2 | ||||
-rwxr-xr-x | manager.c | 13 |
2 files changed, 12 insertions, 3 deletions
@@ -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> @@ -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; } |