summaryrefslogtreecommitdiff
path: root/apps/confbridge/conf_config_parser.c
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2014-03-27 19:21:44 +0000
committerCorey Farrell <git@cfware.com>2014-03-27 19:21:44 +0000
commitfbe0dfaf4410a4ed34cca248d0885ea87c747e27 (patch)
treeb8adead7bbb0c61a5b1873c5432dd0359af50047 /apps/confbridge/conf_config_parser.c
parent44409401ec7d754a2af861f599e88e5199c2ccf0 (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 'apps/confbridge/conf_config_parser.c')
-rw-r--r--apps/confbridge/conf_config_parser.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 0e81e7e8e..ec841c92c 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -952,6 +952,11 @@ int func_confbridge_helper(struct ast_channel *chan, const char *cmd, char *data
AST_APP_ARG(option);
);
+ if (!chan) {
+ ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd);
+ return -1;
+ }
+
/* parse all the required arguments and make sure they exist. */
if (ast_strlen_zero(data)) {
return -1;