Resolve a potential deadlock. In this case, a single queue is locked, then the queue...

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 298fab19e4e77c6c564864e369c764d927f98aee..56ab9fc73082f1c830e50712a99ef24549685799 100644 (file)
--- 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 {