[asterisk-commits] mmichelson: branch 1.6.0 r114047 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Apr 10 14:59:27 2008
New Revision: 114047

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114047
Log:
Merged revisions 114046 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114046 | mmichelson | 2008-04-10 14:58:36 -0500 (Thu, 10 Apr 2008) | 14 lines

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


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=114047&r1=114046&r2=114047
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Apr 10 14:59:27 2008
@@ -16697,7 +16697,7 @@
 				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) {