diff options
author | Corey Farrell <git@cfware.com> | 2014-03-27 19:21:44 +0000 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2014-03-27 19:21:44 +0000 |
commit | fbe0dfaf4410a4ed34cca248d0885ea87c747e27 (patch) | |
tree | b8adead7bbb0c61a5b1873c5432dd0359af50047 /funcs/func_dialplan.c | |
parent | 44409401ec7d754a2af861f599e88e5199c2ccf0 (diff) |
Fix dialplan function NULL channel safety issues
(closes issue ASTERISK-23391)
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/3386/
........
Merged revisions 411313 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 411314 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 411315 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_dialplan.c')
-rw-r--r-- | funcs/func_dialplan.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/funcs/func_dialplan.c b/funcs/func_dialplan.c index d06ddba9a..02b4c7a9e 100644 --- a/funcs/func_dialplan.c +++ b/funcs/func_dialplan.c @@ -96,20 +96,23 @@ static int isexten_function_read(struct ast_channel *chan, const char *cmd, char int priority_num; if (sscanf(args.priority, "%30d", &priority_num) == 1 && priority_num > 0) { int res; - res = ast_exists_extension(chan, args.context, args.exten, priority_num, + res = ast_exists_extension(chan, args.context, args.exten, priority_num, + !chan ? NULL : S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL)); if (res) strcpy(buf, "1"); } else { int res; res = ast_findlabel_extension(chan, args.context, args.exten, args.priority, + !chan ? NULL : S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL)); if (res > 0) strcpy(buf, "1"); } } else if (!ast_strlen_zero(args.exten)) { int res; - res = ast_exists_extension(chan, args.context, args.exten, 1, + res = ast_exists_extension(chan, args.context, args.exten, 1, + !chan ? NULL : S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL)); if (res) strcpy(buf, "1"); @@ -133,6 +136,11 @@ static int acf_isexten_exec(struct ast_channel *chan, const char *cmd, char *par AST_APP_ARG(priority); ); + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + AST_STANDARD_APP_ARGS(args, parse); if (ast_strlen_zero(args.context)) { |