From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 10 Apr 2008 19:58:36 +0000 (+0000)
Subject: Merged revisions 114045 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~2505
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d13b45564b2c4dc7efc1539fa53d8dd4e7929365;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4d0bbf8410..cf758c49ee 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) {