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_cdr.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_cdr.c')
| -rw-r--r-- | funcs/func_cdr.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c index 0116eee7f..44ecf4d6b 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -441,6 +441,11 @@ static int cdr_read(struct ast_channel *chan, const char *cmd, char *parse, ao2_alloc(sizeof(*payload), NULL), ao2_cleanup); struct cdr_func_data output = { 0, }; + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + if (!payload) { return -1; } @@ -489,6 +494,11 @@ static int cdr_write(struct ast_channel *chan, const char *cmd, char *parse, RAII_VAR(struct stasis_message_router *, router, ast_cdr_message_router(), ao2_cleanup); + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + if (!router) { ast_log(AST_LOG_WARNING, "Failed to manipulate CDR for channel %s: no message router\n", ast_channel_name(chan)); @@ -522,6 +532,11 @@ static int cdr_prop_write(struct ast_channel *chan, const char *cmd, char *parse ao2_alloc(sizeof(*payload), NULL), ao2_cleanup); RAII_VAR(struct stasis_message_router *, router, ast_cdr_message_router(), ao2_cleanup); + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + if (!router) { ast_log(AST_LOG_WARNING, "Failed to manipulate CDR for channel %s: no message router\n", ast_channel_name(chan)); |