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: https://origsvn.digium.com/svn/asterisk/trunk@236186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
ffd9d82472
commit
24107651e7
|
@ -2295,7 +2295,7 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, const char
|
|||
if (ast_compat_res_agi && !ast_strlen_zero(argv[2])) {
|
||||
char *compat = alloca(strlen(argv[2]) * 2 + 1), *cptr;
|
||||
const char *vptr;
|
||||
for (cptr = compat, vptr = argv[2]; *vptr; vptr++) {
|
||||
for (cptr = compat, vptr = (argc == 2) ? "" : argv[2]; *vptr; vptr++) {
|
||||
if (*vptr == ',') {
|
||||
*cptr++ = '\\';
|
||||
*cptr++ = ',';
|
||||
|
@ -2308,7 +2308,7 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, const char
|
|||
*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]);
|
||||
|
|
Loading…
Reference in New Issue