From: Jason Parker Date: Thu, 28 Jul 2011 15:45:24 +0000 (+0000) Subject: Fix a SIP transfer deadlock. X-Git-Tag: 1.8.6.0-rc1~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31bc8710d7474fc7931d565e7f36437922c4ec00;p=thirdparty%2Fasterisk.git 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 d2e3f65edf..20116ce17e 100644 --- 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); }