<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/12993">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Joshua Colp: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stasis: Pass bumped topic_all reference to proxy_dtor.<br><br>This avoids use of the global variable and ensures topic_all remains<br>active until all topics are freed.<br><br>ASTERISK-28553<br>patches:<br>  ASTERISK-28553.patch by coreyfarrell (license 5909)<br><br>Change-Id: I9a8cd8977f3c3a6aa00783f8336d2cfb9c2820f1<br>---<br>M main/stasis.c<br>1 file changed, 5 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/stasis.c b/main/stasis.c</span><br><span>index 1947481..618bee0 100644</span><br><span>--- a/main/stasis.c</span><br><span>+++ b/main/stasis.c</span><br><span>@@ -406,9 +406,10 @@</span><br><span> AO2_STRING_FIELD_CMP_FN(topic_proxy, name);</span><br><span> AO2_STRING_FIELD_CASE_SORT_FN(topic_proxy, name);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void proxy_dtor(void *weakproxy, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+static void proxy_dtor(void *weakproxy, void *container)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_unlink(topic_all, weakproxy);</span><br><span style="color: hsl(120, 100%, 40%);">+     ao2_unlink(container, weakproxy);</span><br><span style="color: hsl(120, 100%, 40%);">+     ao2_cleanup(container);</span><br><span> }</span><br><span> </span><br><span> /* Forward declarations for the tightly-coupled subscription object */</span><br><span>@@ -537,9 +538,10 @@</span><br><span>            return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (ao2_weakproxy_subscribe(proxy, proxy_dtor, NULL, OBJ_NOLOCK)) {</span><br><span style="color: hsl(120, 100%, 40%);">+   if (ao2_weakproxy_subscribe(proxy, proxy_dtor, ao2_bump(topic_all), OBJ_NOLOCK)) {</span><br><span>           ao2_cleanup(proxy);</span><br><span>          ao2_unlock(topic_all);</span><br><span style="color: hsl(120, 100%, 40%);">+                ao2_cleanup(topic_all);</span><br><span> </span><br><span>          return -1;</span><br><span>   }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/12993">change 12993</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/12993"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I9a8cd8977f3c3a6aa00783f8336d2cfb9c2820f1 </div>
<div style="display:none"> Gerrit-Change-Number: 12993 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>