Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv21908
Modified Files:
manager.c ChangeLog
Log Message:
Issue #5737
Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- manager.c 14 Nov 2005 19:00:38 -0000 1.134
+++ manager.c 15 Nov 2005 01:33:31 -0000 1.135
@@ -329,9 +329,11 @@
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;
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- ChangeLog 14 Nov 2005 19:00:37 -0000 1.121
+++ ChangeLog 15 Nov 2005 01:33:31 -0000 1.122
@@ -1,3 +1,7 @@
+2005-11-14 Josh Roberson <[EMAIL PROTECTED]>
+
+ * Fix crash on variable passing from AMI originate (issue #5737)
+
2005-11-14 Russell Bryant <[EMAIL PROTECTED]>
* many files: Merge doxygen documentation updates. (issue #5605)
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
