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 /channels/chan_sip.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 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 231f376a8..3d52ce4b8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -22232,7 +22232,12 @@ static int func_header_read(struct ast_channel *chan, const char *function, char ); int i, number, start = 0; - if (ast_strlen_zero(data)) { + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function); + return -1; + } + + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "This function requires a header name.\n"); return -1; } @@ -22418,7 +22423,12 @@ static int function_sipchaninfo_read(struct ast_channel *chan, const char *cmd, *buf = 0; - if (!data) { + if (!chan) { + ast_log(LOG_WARNING, "No channel was provided to %s function.\n", cmd); + return -1; + } + + if (!data) { ast_log(LOG_WARNING, "This function requires a parameter name.\n"); return -1; } |