From: Matthew Fredrickson <creslin@digium.com>
Date: Sat, 12 Apr 2008 16:21:29 +0000 (+0000)
Subject: Make sure linkset is locked exiting ss7_start_call
X-Git-Tag: 1.6.2.0-beta1~2491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5110d3bc69e63fe34f9efd6711ec7dad578d2ee2;p=thirdparty%2Fasterisk.git

Make sure linkset is locked exiting ss7_start_call

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 84d4b96a3f..54659903f9 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -9140,6 +9140,7 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
 
 	ast_mutex_unlock(&linkset->lock);
 	c = zt_new(p, AST_STATE_RING, 1, SUB_REAL, law, 0);
+	ast_mutex_lock(&linkset->lock);
 
 	if (!c) {
 		ast_log(LOG_WARNING, "Unable to start PBX on CIC %d\n", p->cic);
@@ -9147,8 +9148,6 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
 	} else
 		ast_verb(3, "Accepting call to '%s' on CIC %d\n", p->exten, p->cic);
 
-	ast_mutex_lock(&linkset->lock);
-
 	zt_enable_ec(p);
 
 	if (!ast_strlen_zero(p->charge_number)) {