1 files changed, 2 insertions, 0 deletions
diff --git a/channel.c b/channel.c
index c39363179..81f3a6660 100755
--- a/channel.c
+++ b/channel.c
@@ -704,8 +704,10 @@ int ast_answer(struct ast_channel *chan)
 	switch(chan->_state) {
 	case AST_STATE_RINGING:
 	case AST_STATE_RING:
+		ast_mutex_lock(&chan->lock);
 		if (chan->pvt->answer)
 			res = chan->pvt->answer(chan);
+		ast_mutex_unlock(&chan->lock);
 		ast_setstate(chan, AST_STATE_UP);
 		if (chan->cdr)
 			ast_cdr_answer(chan->cdr);