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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stasis: Fix leaks<br><br>* Release reference returned by cache_remove<br>* state_alloc unconditionally bumped state_topic even when it was<br>  locally allocated.<br><br>Change-Id: I51101bf7d07b8dc8ce8fc46b6cb31fbbd213fbc7<br>---<br>M main/stasis_cache.c<br>M main/stasis_state.c<br>2 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/stasis_cache.c b/main/stasis_cache.c</span><br><span>index 6be4bf1..bcd7e7d 100644</span><br><span>--- a/main/stasis_cache.c</span><br><span>+++ b/main/stasis_cache.c</span><br><span>@@ -868,7 +868,7 @@</span><br><span>                      ao2_wrlock(caching_topic->cache->entries);</span><br><span>                     sub = cache_find(caching_topic->cache->entries, stasis_subscription_change_type(), change->uniqueid);</span><br><span>                       if (sub) {</span><br><span style="color: hsl(0, 100%, 40%);">-                              cache_remove(caching_topic->cache->entries, sub, stasis_message_eid(message));</span><br><span style="color: hsl(120, 100%, 40%);">+                          ao2_cleanup(cache_remove(caching_topic->cache->entries, sub, stasis_message_eid(message)));</span><br><span>                            ao2_cleanup(sub);</span><br><span>                    }</span><br><span>                    ao2_unlock(caching_topic->cache->entries);</span><br><span>diff --git a/main/stasis_state.c b/main/stasis_state.c</span><br><span>index a915972..aa00f9a 100644</span><br><span>--- a/main/stasis_state.c</span><br><span>+++ b/main/stasis_state.c</span><br><span>@@ -165,6 +165,13 @@</span><br><span>                     return NULL;</span><br><span>                 }</span><br><span>            ast_free(name);</span><br><span style="color: hsl(120, 100%, 40%);">+       } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              /*</span><br><span style="color: hsl(120, 100%, 40%);">+             * Since the state topic was passed in, go ahead and bump its reference.</span><br><span style="color: hsl(120, 100%, 40%);">+               * By doing this here first, it allows us to consistently decrease the reference on</span><br><span style="color: hsl(120, 100%, 40%);">+            * state allocation error.</span><br><span style="color: hsl(120, 100%, 40%);">+             */</span><br><span style="color: hsl(120, 100%, 40%);">+           ao2_ref(state_topic, +1);</span><br><span>    }</span><br><span> </span><br><span>        if (!id) {</span><br><span>@@ -175,13 +182,6 @@</span><br><span>            id = state_id_by_topic(manager->all_topic, state_topic);</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /*</span><br><span style="color: hsl(0, 100%, 40%);">-       * Since the state topic could have been passed in, go ahead and bump its reference.</span><br><span style="color: hsl(0, 100%, 40%);">-     * By doing this here first, it allows us to consistently decrease the reference on</span><br><span style="color: hsl(0, 100%, 40%);">-      * state allocation error.</span><br><span style="color: hsl(0, 100%, 40%);">-       */</span><br><span style="color: hsl(0, 100%, 40%);">-     ao2_ref(state_topic, +1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    state = ao2_alloc(sizeof(*state) + strlen(id) + 1, state_dtor);</span><br><span>      if (!state) {</span><br><span>                ast_log(LOG_ERROR, "Unable to allocate state '%s' in manager '%s'\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/12907">change 12907</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/+/12907"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I51101bf7d07b8dc8ce8fc46b6cb31fbbd213fbc7 </div>
<div style="display:none"> Gerrit-Change-Number: 12907 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.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: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>