Lock masquerading into channel

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

1 files changed, 5 insertions, 0 deletions

diff --git a/channels/chan_local.c b/channels/chan_local.c
index b9fc4ac10..221b01135 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -129,11 +129,16 @@ static void check_bridge(struct local_pvt *p, int isoutbound)
 		return;
 	if (isoutbound && p->chan && p->chan->bridge && p->owner) {
 		/* Masquerade bridged channel into owner */
+		/* Lock other side first */
+		ast_pthread_mutex_lock(&p->chan->bridge->lock);
 		ast_channel_masquerade(p->owner, p->chan->bridge);
+		ast_pthread_mutex_unlock(&p->chan->bridge->lock);
 		p->alreadymasqed = 1;
 	} else if (!isoutbound && p->owner && p->owner->bridge && p->chan) {
 		/* Masquerade bridged channel into chan */
+		ast_pthread_mutex_lock(&p->owner->bridge->lock);
 		ast_channel_masquerade(p->chan, p->owner->bridge);
+		ast_pthread_mutex_unlock(&p->owner->bridge->lock);
 		p->alreadymasqed = 1;
 	}
 }