Fix a SIP transfer deadlock.

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

(closes issue AST-470)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@329994 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d2e3f65edfb563b1876cb2786f6d9ed45ad3f725..20116ce17e1327e99dc89d68fd2a76548eb18807 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -22583,8 +22583,6 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
 
                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 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
                        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);
        }