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

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Sep 17 17:37:28 2009
New Revision: 219371

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=219371
Log:
fixes deadlock when performing directed pickup w Invite/replaces

(closes issue #15340)
Reported by: lmsteffan
Patches:
      deadlock.patch uploaded by lmsteffan (license 779)
Tested by: lmsteffan


Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=219371&r1=219370&r2=219371
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Sep 17 17:37:28 2009
@@ -20723,7 +20723,9 @@
 			do_magic_pickup(c, pickup.exten, pickup.context);
 
 			/* Now we're either masqueraded or we failed to pickup, in either case we... */
+			sip_pvt_unlock(p);
 			ast_hangup(c);
+			sip_pvt_lock(p);
 
 			return 0;
 		} else {