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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_rtp_asterisk: Fix crash on ast_rtp_new failure.<br><br>ast_rtp_new free'd rtp upon failure, but rtp_engine.c would also call<br>the destroy callback.  Remove call to ast_free from ast_rtp_new, leave<br>it to rtp_engine.c to initiate the full cleanup.  Add error detection<br>for the ssrc_mapping vector initialization.  In rtp_allocate_transport<br>set rtp->s = -1 in the failure path where we close that FD to ensure we<br>don't try closing it twice.<br><br>ASTERISK-27854 #close<br><br>Change-Id: Ie02aecbb46228ca804e24b19cec2bb6f7b94e451<br>---<br>M res/res_rtp_asterisk.c<br>1 file changed, 5 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c</span><br><span>index c1aa275..a6be2f5 100644</span><br><span>--- a/res/res_rtp_asterisk.c</span><br><span>+++ b/res/res_rtp_asterisk.c</span><br><span>@@ -3504,6 +3504,7 @@</span><br><span>          if (x == startplace || (errno != EADDRINUSE && errno != EACCES)) {</span><br><span>                   ast_log(LOG_ERROR, "Oh dear... we couldn't allocate a port for RTP instance '%p'\n", instance);</span><br><span>                        close(rtp->s);</span><br><span style="color: hsl(120, 100%, 40%);">+                     rtp->s = -1;</span><br><span>                      return -1;</span><br><span>           }</span><br><span>    }</span><br><span>@@ -3650,7 +3651,10 @@</span><br><span>   ast_rtp_instance_set_data(instance, rtp);</span><br><span> </span><br><span>        if (rtp_allocate_transport(instance, rtp)) {</span><br><span style="color: hsl(0, 100%, 40%);">-            ast_free(rtp);</span><br><span style="color: hsl(120, 100%, 40%);">+                return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (AST_VECTOR_INIT(&rtp->ssrc_mapping, 1)) {</span><br><span>                 return -1;</span><br><span>   }</span><br><span> </span><br><span>@@ -3658,7 +3662,6 @@</span><br><span>        rtp->lastrxformat = ao2_bump(ast_format_none);</span><br><span>    rtp->lasttxformat = ao2_bump(ast_format_none);</span><br><span>    rtp->stream_num = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-        AST_VECTOR_INIT(&rtp->ssrc_mapping, 1);</span><br><span> </span><br><span>   return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10234">change 10234</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/10234"/><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: Ie02aecbb46228ca804e24b19cec2bb6f7b94e451 </div>
<div style="display:none"> Gerrit-Change-Number: 10234 </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 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>