diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 16:03:49 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 16:03:49 +0000 |
| commit | 1e06c4f32bf1c972a3d6898275cefe23025004e6 (patch) | |
| tree | 35a52040d4b281470e91943adaa93674857d48c8 | |
| parent | aaf398589152f46253c7b7396c0c4ca91883b510 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@187678 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8ac699641..1ed89df55 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); } |