aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-23 03:10:21 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-23 03:10:21 +0000
commitcb6938c02ce586b9c707c5b97b21e432cbf89a7c (patch)
tree8a0f3ac6cd67822f80ba20f8e21e4f27430835bc
parent9190562b1ea0c6fc0616de7df6d6e537a8c83373 (diff)
Merged revisions 236186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r236186 | tilghman | 2009-12-22 21:07:48 -0600 (Tue, 22 Dec 2009) | 11 lines Merged revisions 236184 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r236184 | tilghman | 2009-12-22 20:55:24 -0600 (Tue, 22 Dec 2009) | 4 lines If EXEC only gets a single argument, don't crash when the second is used. (closes issue #16504) Reported by: bklang ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@236188 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--res/res_agi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_agi.c b/res/res_agi.c
index d953a9d2f..c81ddf9b7 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1473,7 +1473,7 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, char **argv
}
if (ast_compat_res_agi && !ast_strlen_zero(argv[2])) {
char *compat = alloca(strlen(argv[2]) * 2 + 1), *cptr, *vptr;
- for (cptr = compat, vptr = argv[2]; *vptr; vptr++) {
+ for (cptr = compat, vptr = (argc == 2) ? "" : argv[2]; *vptr; vptr++) {
if (*vptr == ',') {
*cptr++ = '\\';
*cptr++ = ',';
@@ -1486,7 +1486,7 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, char **argv
*cptr = '\0';
res = pbx_exec(chan, app_to_exec, compat);
} else {
- res = pbx_exec(chan, app_to_exec, argv[2]);
+ res = pbx_exec(chan, app_to_exec, argc == 2 ? "" : argv[2]);
}
} else {
ast_log(LOG_WARNING, "Could not find application (%s)\n", argv[1]);