[asterisk-commits] kpfleming: branch 1.6.1 r148763 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Oct 14 06:35:52 2008
New Revision: 148763

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

........
  r148754 | kpfleming | 2008-10-14 13:31:40 +0200 (Tue, 14 Oct 2008) | 2 lines
  
  fix some references to the owner of a private structure that may not be present
........

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/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=148763&r1=148762&r2=148763
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Oct 14 06:35:52 2008
@@ -18422,7 +18422,7 @@
 
 	/* Get RTCP quality before end of call */
 	if (p->do_history || p->owner) {
-		struct ast_channel *bridge = ast_bridged_channel(p->owner);
+		struct ast_channel *bridge = p->owner ? ast_bridged_channel(p->owner) : NULL;
 		char *videoqos, *textqos;
 
 		if (p->rtp) {	
@@ -18443,7 +18443,9 @@
 				append_history(p, "RTCPaudioRTT", "Quality:%s", audioqos_rtt);
 			}
 			
-			ast_rtp_set_vars(p->owner, p->rtp);
+			if (p->owner) {
+				ast_rtp_set_vars(p->owner, p->rtp);
+			}
 		}
 
 		if (bridge) {