app_queue: Fix crash when unloading module.

When unloading the app_queue module the members in each queue are
destroyed and as part of this they are removed from the pending
members container. Unfortunately a crash would occur as the container
was destroyed before the members were removed.

This change tweaks ordering so the container destruction occurs
after the members are destroyed.

ASTERISK-16115

Change-Id: I48c728668c55aee3d05b751a5d450fb57e87f44b

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 1df8b697c2cb7e56301942369c7ae7f03ca209c7..dbd83938df56baf9b36cb8f9c294bfdd9a04751a 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -10854,8 +10854,9 @@ static int unload_module(void)
        ast_extension_state_del(0, extension_state_cb);
 
        ast_unload_realtime("queue_members");
-       ao2_cleanup(pending_members);
        ao2_cleanup(queues);
+       ao2_cleanup(pending_members);
+
        queues = NULL;
        return 0;
 }