From 214d980f86c29ea8d44f75bc05914c1ec0382749 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 27 Aug 2007 22:40:19 +0000 Subject: [PATCH] Resolve a potential deadlock. In this case, a single queue is locked, then the queue list. In changethread(), the queue list is locked, and then each individual queue is locked. Under the right circumstances, this could deadlock. As such, I have unlocked the individual queue before locking the queue list, and then locked the queue back after the queue list is unlocked. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81158 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/app_queue.c b/apps/app_queue.c index 298fab19e4..56ab9fc730 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1106,7 +1106,9 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as } else { q->members = next_m; } + ast_mutex_unlock(&q->lock); remove_from_interfaces(m->interface); + ast_mutex_lock(&q->lock); q->membercount--; free(m); } else { @@ -1160,7 +1162,9 @@ static void update_realtime_members(struct call_queue *q) } else { q->members = next_m; } + ast_mutex_unlock(&q->lock); remove_from_interfaces(m->interface); + ast_mutex_lock(&q->lock); q->membercount--; free(m); } else {