aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwisted <twisted@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-15 01:33:31 +0000
committertwisted <twisted@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-15 01:33:31 +0000
commit1bec9f610422acabc817c1c8b39c83d8441dc78a (patch)
tree33d50b28ba124015f0c0e50e9a22811f10259b57
parent8acbf04043137e3a3c1af2b8f1d3ba7fd6614500 (diff)
Issue #5737
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7097 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xChangeLog4
-rwxr-xr-xmanager.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 96320a6f5..8f8c5dfe8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14 Josh Roberson <josh@asteirasgi.com>
+
+ * Fix crash on variable passing from AMI originate (issue #5737)
+
2005-11-14 Russell Bryant <russell@digium.com>
* many files: Merge doxygen documentation updates. (issue #5605)
diff --git a/manager.c b/manager.c
index 1be1a38dc..629cad213 100755
--- a/manager.c
+++ b/manager.c
@@ -329,9 +329,11 @@ struct ast_variable *astman_get_variables(struct message *m)
if (!(var = ast_strdupa(m->headers[x] + varlen)))
return head;
- if ((var_count = ast_app_separate_args(var, '|', vars, sizeof(vars) / sizeof(var[0])))) {
+ if ((var_count = ast_app_separate_args(var, '|', vars, sizeof(vars) / sizeof(vars[0])))) {
for (y = 0; y < var_count; y++) {
- var = val = vars[y];
+ if (!vars[y])
+ continue;
+ var = val = ast_strdupa(vars[y]);
strsep(&val, "=");
if (!val || ast_strlen_zero(var))
continue;