summaryrefslogtreecommitdiff
path: root/res/res_xmpp.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 /res/res_xmpp.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 'res/res_xmpp.c')
-rw-r--r--res/res_xmpp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index c067fdec4..fcdd2c4a8 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -2045,7 +2045,7 @@ static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, ch
start = ast_tvnow();
- if (ast_autoservice_start(chan) < 0) {
+ if (chan && ast_autoservice_start(chan) < 0) {
ast_log(LOG_WARNING, "Cannot start autoservice for channel %s\n", ast_channel_name(chan));
return -1;
}
@@ -2117,7 +2117,7 @@ static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, ch
diff = ast_tvdiff_ms(ast_tvnow(), start);
}
- if (ast_autoservice_stop(chan) < 0) {
+ if (chan && ast_autoservice_stop(chan) < 0) {
ast_log(LOG_WARNING, "Cannot stop autoservice for channel %s\n", ast_channel_name(chan));
}