From 0e2190687fde870d1f242bd3cf324bda544bb8a5 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Mon, 11 Aug 2003 20:47:48 +0000 Subject: [PATCH] Lock everything that might need to be locked git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1292 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_local.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/channels/chan_local.c b/channels/chan_local.c index 221b011351..3d4511d955 100755 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -131,13 +131,17 @@ static void check_bridge(struct local_pvt *p, int isoutbound) /* Masquerade bridged channel into owner */ /* Lock other side first */ ast_pthread_mutex_lock(&p->chan->bridge->lock); + ast_pthread_mutex_lock(&p->owner->lock); ast_channel_masquerade(p->owner, p->chan->bridge); + ast_pthread_mutex_unlock(&p->owner->lock); 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_pthread_mutex_lock(&p->chan->lock); ast_channel_masquerade(p->chan, p->owner->bridge); + ast_pthread_mutex_unlock(&p->chan->lock); ast_pthread_mutex_unlock(&p->owner->bridge->lock); p->alreadymasqed = 1; }