Fix race in agent/masquerade

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

1 files changed, 2 insertions, 0 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 77a8ba10e..cf6e3b362 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -634,8 +634,10 @@ static int check_availability(struct agent_pvt *newlyavailable, int needlock)
 				ast_setstate(chan, AST_STATE_UP);
 				/* Go ahead and mark the channel as a zombie so that masquerade will
 				   destroy it for us, and we need not call ast_hangup */
+				ast_pthread_mutex_lock(&parent->lock);
 				chan->zombie = 1;
 				ast_channel_masquerade(parent, chan);
+				ast_pthread_mutex_unlock(&parent->lock);
 				p->abouttograb = 0;
 			} else {
 				ast_log(LOG_DEBUG, "Sneaky, parent disappeared in the mean time...\n");