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_groupcount.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_groupcount.c')
-rw-r--r-- | funcs/func_groupcount.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index 95ee0cde6..4ea681691 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -104,6 +104,11 @@ static int group_count_function_read(struct ast_channel *chan, const char *cmd, int count = -1; char group[80] = "", category[80] = ""; + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category)); @@ -174,9 +179,14 @@ static int group_function_read(struct ast_channel *chan, const char *cmd, { int ret = -1; struct ast_group_info *gi = NULL; - + + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + ast_app_group_list_rdlock(); - + for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, group_list)) { if (gi->chan != chan) continue; @@ -201,6 +211,11 @@ static int group_function_write(struct ast_channel *chan, const char *cmd, { char grpcat[256]; + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + if (!value) { return -1; } |