summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2008-04-10 19:58:36 +0000
committerMark Michelson <mmichelson@digium.com>2008-04-10 19:58:36 +0000
commitd13b45564b2c4dc7efc1539fa53d8dd4e7929365 (patch)
tree4ce3eafac40742022e28e3fe01d361d381882c5f
parent954fea4d104ac78ef478a9bf9029143ee5fe182a (diff)
Merged revisions 114045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114045 | mmichelson | 2008-04-10 14:55:33 -0500 (Thu, 10 Apr 2008) | 6 lines Be sure that we're not about to set bridgepvt NULL prior to dereferencing it. (closes issue #11775) Reported by: fujin ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4d0bbf841..cf758c49e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16796,7 +16796,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
struct ast_channel *bridgepeer = NULL;
struct sip_pvt *bridgepvt = NULL;
if ((bridgepeer = ast_bridged_channel(p->owner))) {
- if (IS_SIP_TECH(bridgepeer->tech)) {
+ if (IS_SIP_TECH(bridgepeer->tech) && !ast_check_hangup(bridgepeer)) {
bridgepvt = (struct sip_pvt*)bridgepeer->tech_pvt;
/* Does the bridged peer have T38 ? */
if (bridgepvt->t38.state == T38_ENABLED) {