sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stasis: Pass bumped topic_all reference to proxy_dtor. 

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
This commit is contained in:
Joshua Colp 2019-10-01 14:01:17 +00:00
parent 82e8033e39
commit ce1e0714ba
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/stasis.c
View 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;
}