[svn-commits] tilghman: branch 1.6.1 r187678 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Apr 10 11:03:49 2009
New Revision: 187678

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=187678
Log:
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
........

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

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=187678&r1=187677&r2=187678
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Apr 10 11:03:49 2009
@@ -5264,7 +5264,7 @@
 				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 @@
 		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);
 		}