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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">main/stun.c: fix crash upon STUN request timeout<br><br>Some ast_stun_request users do not provide a destination address when<br>sending to a connection-mode socket.<br><br>ASTERISK-29691<br><br>Change-Id: Idd9114c3380216ba48abfc3c68619e79ad37defc<br>---<br>M main/stun.c<br>1 file changed, 11 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/stun.c b/main/stun.c</span><br><span>index 4e9dac1..7a8e0e5 100644</span><br><span>--- a/main/stun.c</span><br><span>+++ b/main/stun.c</span><br><span>@@ -239,17 +239,24 @@</span><br><span> </span><br><span> static void handle_stun_timeout(int retry, struct sockaddr_in *dst)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+     char *stun_destination = "";</span><br><span style="color: hsl(120, 100%, 40%);">+        if (dst) {</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_asprintf(&stun_destination, "to '%s' ", ast_inet_ntoa(dst->sin_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span>    if (retry < STUN_MAX_RETRIES) {</span><br><span>           ast_log(LOG_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">-                     "Attempt %d to send STUN request to '%s' timed out.",</span><br><span style="color: hsl(120, 100%, 40%);">+                       "Attempt %d to send STUN request %stimed out.\n",</span><br><span>                  retry,</span><br><span style="color: hsl(0, 100%, 40%);">-                  ast_inet_ntoa(dst->sin_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+                     stun_destination);</span><br><span>   } else {</span><br><span>             ast_log(LOG_WARNING,</span><br><span style="color: hsl(0, 100%, 40%);">-                    "Attempt %d to send STUN request to '%s' timed out."</span><br><span style="color: hsl(120, 100%, 40%);">+                        "Attempt %d to send STUN request %stimed out. "</span><br><span>                    "Check that the server address is correct and reachable.\n",</span><br><span>                       retry,</span><br><span style="color: hsl(0, 100%, 40%);">-                  ast_inet_ntoa(dst->sin_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+                     stun_destination);</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (dst) {</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_free(stun_destination);</span><br><span>  }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16609">change 16609</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/+/16609"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Idd9114c3380216ba48abfc3c68619e79ad37defc </div>
<div style="display:none"> Gerrit-Change-Number: 16609 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Sébastien Duthil <sduthil@wazo.community> </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@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>