[svn-commits] dvossel: branch 1.6.1 r222545 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Oct  7 12:46:37 2009
New Revision: 222545

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

................
  r222543 | dvossel | 2009-10-07 12:44:52 -0500 (Wed, 07 Oct 2009) | 14 lines
  
  Merged revisions 222542 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r222542 | dvossel | 2009-10-07 12:41:21 -0500 (Wed, 07 Oct 2009) | 8 lines
    
    crash on transfer
    
    handle_invite_replaces() attempts to uplock a pvt's
    owner channel without first verifing that it exists.
    
    (issue #16027)
  ........
................

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://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=222545&r1=222544&r2=222545
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Oct  7 12:46:37 2009
@@ -17890,7 +17890,10 @@
 			can't harm */
 		transmit_response_with_sdp(p, "200 OK", req, XMIT_RELIABLE, FALSE);
 		/* Do something more clever here */
-		ast_channel_unlock(c);
+		if (c) {
+			*nounlock = 1;
+			ast_channel_unlock(c);
+		}
 		ast_channel_unlock(replacecall);
 		sip_pvt_unlock(p->refer->refer_call);
 		return 1;