stasis: Pass bumped topic_all reference to proxy_dtor.
authorJoshua Colp <jcolp@digium.com>
Tue, 1 Oct 2019 14:01:17 +0000 (14:01 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 1 Oct 2019 14:06:07 +0000 (09:06 -0500)
This avoids use of the global variable and ensures topic_all remains
active until all topics are freed.

ASTERISK-28553
patches:
  ASTERISK-28553.patch by coreyfarrell (license 5909)

Change-Id: I9a8cd8977f3c3a6aa00783f8336d2cfb9c2820f1

main/stasis.c

index 02f6e53..d7aafaa 100644 (file)
@@ -406,9 +406,10 @@ AO2_STRING_FIELD_HASH_FN(topic_proxy, name);
 AO2_STRING_FIELD_CMP_FN(topic_proxy, name);
 AO2_STRING_FIELD_CASE_SORT_FN(topic_proxy, name);
 
-static void proxy_dtor(void *weakproxy, void *data)
+static void proxy_dtor(void *weakproxy, void *container)
 {
-       ao2_unlink(topic_all, weakproxy);
+       ao2_unlink(container, weakproxy);
+       ao2_cleanup(container);
 }
 
 /* Forward declarations for the tightly-coupled subscription object */
@@ -537,9 +538,10 @@ static int link_topic_proxy(struct stasis_topic *topic, const char *name, const
                return -1;
        }
 
-       if (ao2_weakproxy_subscribe(proxy, proxy_dtor, NULL, OBJ_NOLOCK)) {
+       if (ao2_weakproxy_subscribe(proxy, proxy_dtor, ao2_bump(topic_all), OBJ_NOLOCK)) {
                ao2_cleanup(proxy);
                ao2_unlock(topic_all);
+               ao2_cleanup(topic_all);
 
                return -1;
        }