<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7642">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_softmix: Fix memory leaks.<br><br>Change-Id: Ifaf3e93b398595d21d07f535330fef77ff15a80c<br>---<br>M bridges/bridge_softmix.c<br>1 file changed, 3 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c<br>index 8de88f2..6460a6e 100644<br>--- a/bridges/bridge_softmix.c<br>+++ b/bridges/bridge_softmix.c<br>@@ -672,6 +672,7 @@<br>                                ast_log(LOG_ERROR, "Bridge %s: Failed to join channel %s. "<br>                                                 "Could not allocate enough memory.\n", bridge->uniqueid,<br>                                                 ast_channel_name(bridge_channel->chan));<br>+                          ast_free(sc);<br>                                 return -1;<br>                    }<br>             }<br>@@ -1306,6 +1307,8 @@<br>              ast_log(LOG_NOTICE, "Failed to re-allocate softmix mixing structure.\n");<br>           return -1;<br>    }<br>+    mixing_array->buffers = tmp;<br>+<br>    if (binaural_active) {<br>                struct convolve_channel_pair **tmp2;<br>          if (!(tmp2 = ast_realloc(mixing_array->chan_pairs,<br>@@ -1315,7 +1318,6 @@<br>          }<br>             mixing_array->chan_pairs = tmp2;<br>   }<br>-    mixing_array->buffers = tmp;<br>       return 0;<br> }<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7642">change 7642</a>. To unsubscribe, 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/7642"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifaf3e93b398595d21d07f535330fef77ff15a80c </div>
<div style="display:none"> Gerrit-Change-Number: 7642 </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: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>