From fbe0dfaf4410a4ed34cca248d0885ea87c747e27 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Thu, 27 Mar 2014 19:21:44 +0000 Subject: 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 --- res/res_jabber.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'res/res_jabber.c') diff --git a/res/res_jabber.c b/res/res_jabber.c index 41dd70c02..ede498124 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -845,7 +845,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)); ASTOBJ_UNREF(client, ast_aji_client_destroy); return -1; @@ -917,7 +917,7 @@ static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, ch } ASTOBJ_UNREF(client, ast_aji_client_destroy); - 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)); } -- cgit v1.2.3