From cc89ade9e6855f7e05508fb7017274b946a3c7ae Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 10 Apr 2009 16:03:49 +0000 Subject: [PATCH] Merged revisions 187674 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r187674 | tilghman | 2009-04-10 10:59:40 -0500 (Fri, 10 Apr 2009) | 4 lines Ensure pvt is not NULL before dereferencing it. (closes issue #14784) Reported by: pj ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@187678 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8ac6996413..1ed89df55d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5264,7 +5264,7 @@ static int sip_hangup(struct ast_channel *ast) if (bridge) { struct sip_pvt *q = bridge->tech_pvt; - if (IS_SIP_TECH(bridge->tech) && q) + if (IS_SIP_TECH(bridge->tech) && q && q->rtp) ast_rtp_set_vars(bridge, q->rtp); } @@ -19097,7 +19097,7 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req) if (bridge) { struct sip_pvt *q = bridge->tech_pvt; - if (IS_SIP_TECH(bridge->tech) && q->rtp) + if (IS_SIP_TECH(bridge->tech) && q && q->rtp) ast_rtp_set_vars(bridge, q->rtp); }