From 55a92b74995a676cf7bb689c9ba49b54ef429fb3 Mon Sep 17 00:00:00 2001 From: Gregory Nietsky Date: Mon, 24 Oct 2011 07:31:10 +0000 Subject: [PATCH] queues container needs locking when using the OBJ_NOLOCK flag git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@342017 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 28889e3146..2ffbc84d96 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -6993,6 +6993,9 @@ static int reload_queues(int reload, struct ast_flags *mask, const char *queuena return -1; } + /* We've made it here, so it looks like we're doing operations on all queues. */ + ao2_lock(queues); + /* Mark all queues as dead for the moment if we're reloading queues. * For clarity, we could just be reloading members, in which case we don't want to mess * with the other queue parameters at all*/ @@ -7016,6 +7019,7 @@ static int reload_queues(int reload, struct ast_flags *mask, const char *queuena if (queue_reload) { ao2_callback(queues, OBJ_NODATA | OBJ_MULTIPLE | OBJ_UNLINK | OBJ_NOLOCK, kill_dead_queues, (char *) queuename); } + ao2_unlock(queues); return 0; } -- 2.47.2