diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-06-06 05:27:14 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-06-06 05:27:14 +0000 |
commit | 1eac38db1dd84a5a4496e39b7ee757a170a568f5 (patch) | |
tree | f6cf66d34977686b8df0da552dd004f678246218 | |
parent | 80a153af79d7fa24b99887623135ef8854ec6077 (diff) |
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
-rw-r--r-- | channel.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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); |