issue #5770

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7117 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 1 deletions

diff --git a/channel.c b/channel.c
index 66560fef0..585ed90f6 100755
--- a/channel.c
+++ b/channel.c
@@ -667,7 +667,11 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin)
 int ast_queue_hangup(struct ast_channel *chan)
 {
 	struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP };
-	chan->_softhangup |= AST_SOFTHANGUP_DEV;
+	/* Yeah, let's not change a lock-critical value without locking */
+	if (!ast_mutex_trylock(&chan->lock)) {
+		chan->_softhangup |= AST_SOFTHANGUP_DEV;
+		ast_mutex_unlock(&chan->lock);
+	}
 	return ast_queue_frame(chan, &f);
 }