[svn-commits] qwell: branch 1.8 r329994 - /branches/1.8/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Jul 28 10:45:24 2011
New Revision: 329994

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329994
Log:
Fix a SIP transfer deadlock.

The locking in this function is very scary.  There are like 6 structs involved.

(closes issue AST-470)

Modified:
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=329994&r1=329993&r2=329994
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Thu Jul 28 10:45:24 2011
@@ -22583,8 +22583,6 @@
 
 		ast_do_masquerade(target.chan1);
 
-		sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
-
 		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
 		if (target.chan2) {
 			ast_indicate(target.chan2, AST_CONTROL_UNHOLD);
@@ -22625,6 +22623,8 @@
 			ast_channel_queue_connected_line_update(target.chan1, &connected_to_transferee, NULL);
 
 		}
+		sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
+
 		ast_channel_unref(current->chan1);
 	}