Fix lock destruction/unlock inversion

When using scoped locks, the unref of an AO2 object should happen after
the unlock occurs which requires usage of scoped refs.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383377 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c
index 01ad88ae07f46e2da6829f904e46eedd93f5a0d9..97ed7ad92c343bf37c27707958f7ca3b7f2b3621 100644 (file)
--- a/main/stasis_message_router.c
+++ b/main/stasis_message_router.c
@@ -91,6 +91,7 @@ static void router_dispatch(void *data,
                            struct stasis_message *message)
 {
        struct stasis_message_router *router = data;
+       RAII_VAR(struct stasis_message_router *, router_needs_cleanup, NULL, ao2_cleanup);
        RAII_VAR(struct stasis_message_route *, route, NULL, ao2_cleanup);
        struct stasis_message_type *type = stasis_message_type(message);
        size_t i;
@@ -123,7 +124,7 @@ static void router_dispatch(void *data,
        }
 
        if (stasis_subscription_final_message(sub, message)) {
-               ao2_cleanup(router);
+               router_needs_cleanup = router;
                return;
        }