automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@8607 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 2 deletions

diff --git a/channel.c b/channel.c
index 56d06978d..ff5390c95 100644
--- a/channel.c
+++ b/channel.c
@@ -2005,10 +2005,12 @@ int ast_indicate(struct ast_channel *chan, int condition)
 {
 	int res = -1;
 
+	ast_mutex_lock(&chan->lock);
 	/* Stop if we're a zombie or need a soft hangup */
-	if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) 
+	if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
+		ast_mutex_unlock(&chan->lock);
 		return -1;
-	ast_mutex_lock(&chan->lock);
+	}
 	if (chan->tech->indicate)
 		res = chan->tech->indicate(chan, condition);
 	ast_mutex_unlock(&chan->lock);