From: Mark Spencer <markster@digium.com>
Date: Thu, 11 Aug 2005 16:43:36 +0000 (+0000)
Subject: Fix potential deadlock in asterisk
X-Git-Tag: 1.2.0-beta1~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2c72aca7b32ecbaec0072438bbcd01c63e3232d;p=thirdparty%2Fasterisk.git

Fix potential deadlock in asterisk


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index b352a1fa64..3b135e2799 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3200,6 +3200,7 @@ static int attempt_transfer(struct zt_pvt *p)
 		ast_log(LOG_DEBUG, "Neither %s nor %s are in a bridge, nothing to transfer\n",
 					p->subs[SUB_REAL].owner->name, p->subs[SUB_THREEWAY].owner->name);
 		p->subs[SUB_THREEWAY].owner->_softhangup |= AST_SOFTHANGUP_DEV;
+		return -1;
 	}
 	return 0;
 }