From 1eac38db1dd84a5a4496e39b7ee757a170a568f5 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 6 Jun 2006 05:27:14 +0000 Subject: fix a channel deadlock in ast_answer (deadlock reported by and debuged with hads on #asterisk-dev on IRC) (probably fixes issue #7267, maybe others) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32478 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channel.c b/channel.c index e8f309eb1..214a79c4e 100644 --- a/channel.c +++ b/channel.c @@ -1502,8 +1502,10 @@ int ast_answer(struct ast_channel *chan) int res = 0; ast_channel_lock(chan); /* You can't answer an outbound call */ - if (ast_test_flag(chan, AST_FLAG_OUTGOING)) + if (ast_test_flag(chan, AST_FLAG_OUTGOING)) { + ast_channel_unlock(chan); return 0; + } /* Stop if we're a zombie or need a soft hangup */ if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { ast_channel_unlock(chan); -- cgit v1.2.3