[asterisk-commits] dvossel: trunk r319146 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon May 16 10:58:12 2011
New Revision: 319146

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319146
Log:
Merged revisions 319145 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319145 | dvossel | 2011-05-16 10:57:26 -0500 (Mon, 16 May 2011) | 9 lines
  
  Merged revisions 319144 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r319144 | dvossel | 2011-05-16 10:56:16 -0500 (Mon, 16 May 2011) | 2 lines
    
    Fixes issue with peer ref-counting during handle_request_subscribe.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=319146&r1=319145&r2=319146
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon May 16 10:58:12 2011
@@ -24033,7 +24033,7 @@
 		const char *unknown_acceptheader = NULL;
 
 		if (authpeer)	/* We do not need the authpeer any more */
-			unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 2)");
+			authpeer = unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 2)");
 
 		/* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */
 		accept = __get_header(req, "Accept", &start);
@@ -24164,9 +24164,10 @@
 		return 0;
 	}
 
-	/* At this point, if we have an authpeer (which we have to have to get here) we should unref
-	 * it since if we have actually used it, we have reffed it when p->relatedpeer was set. */
-	authpeer = unref_peer(authpeer, "unref pointer into (*authpeer)");
+	/* At this point, if we have an authpeer we should unref it. */
+	if (authpeer) {
+		authpeer = unref_peer(authpeer, "unref pointer into (*authpeer)");
+	}
 
 	/* Add subscription for extension state from the PBX core */
 	if (p->subscribed != MWI_NOTIFICATION  && p->subscribed != CALL_COMPLETION && !resubscribe) {