aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-17 22:38:47 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-17 22:38:47 +0000
commit6fe15ad0f2f29b84ff55ddc330fd5a5240b53441 (patch)
tree9007e5864e0d75c4c3362b91ad171bfe211e7a1a
parent46a0fe5e269023c9d51a153bc688a09ab46ee702 (diff)
Merged revisions 219371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r219371 | dvossel | 2009-09-17 17:37:28 -0500 (Thu, 17 Sep 2009) | 9 lines 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 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@219376 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 15174dac5..7606c1f59 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19716,7 +19716,9 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
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 {