From: Matthew Nicholson <mnicholson@digium.com>
Date: Tue, 7 Jul 2009 18:24:13 +0000 (+0000)
Subject: Fix a deadlock in sig_analog
X-Git-Tag: 11.0.0-beta1~4541
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf8395002db0a1988089687cd4bc07b3ed87fff2;p=thirdparty%2Fasterisk.git

Fix a deadlock in sig_analog


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

diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index 556a2443c3..e397e5f4f9 100644
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -536,7 +536,7 @@ static int analog_attempt_transfer(struct analog_pvt *p)
 		}
 		/* Three-way is now the REAL */
 		analog_swap_subs(p, ANALOG_SUB_THREEWAY, ANALOG_SUB_REAL);
-		ast_channel_unlock(p->subs[ANALOG_SUB_THREEWAY].owner);
+		ast_channel_unlock(p->subs[ANALOG_SUB_REAL].owner); /* unlock REAL because THREEWAY has become REAL */
 		analog_unalloc_sub(p, ANALOG_SUB_THREEWAY);
 		/* Tell the caller not to hangup */
 		return 1;