<p>nappsoft has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15209">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_nat.c: Create deep copies of strings when appropriate<br><br>In rewrite_uri asterisk was not making deep copies of strings when<br>changing the uri. This was in some cases causing garbage in the route<br>header and in other cases even crashing asterisk when receiving a<br>message with a record-route header set. Thanks to Ralf Kubis for<br>pointing out why this happens. A similar problem was found in<br>res_pjsip_transport_websocket.c. Pjproject needs as well to be patched<br>to avoid garbage in CANCEL messages.<br><br>It was as well observed that (at least for incoming messages)<br>rewrite_uri is called twice, if a record-route header is set as the<br>record-route header is already part of the dialog's route_set. This was<br>causing crashes in some cases as well. So the patch also prevents<br>asterisk from calling rewrite_uri twice on incoming messages if a<br>record-route header is set.<br><br>ASTERISK-29024 #close<br><br>Change-Id: Ic5acd7fa2fbda3080f5f36ef12e46804939b198b<br>---<br>M res/res_pjsip_nat.c<br>M res/res_pjsip_transport_websocket.c<br>2 files changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/09/15209/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c</span><br><span>index 9dab32a..3172e78 100644</span><br><span>--- a/res/res_pjsip_nat.c</span><br><span>+++ b/res/res_pjsip_nat.c</span><br><span>@@ -73,7 +73,7 @@</span><br><span>                save_orig_contact_host(rdata, uri);</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   pj_cstr(&uri->host, rdata->pkt_info.src_name);</span><br><span style="color: hsl(120, 100%, 40%);">+      pj_strdup2(rdata->tp_info.pool, &uri->host, rdata->pkt_info.src_name);</span><br><span>  uri->port = rdata->pkt_info.src_port;</span><br><span>  if (!strcasecmp("WSS", rdata->tp_info.transport->type_name)) {</span><br><span>               /* WSS is special, we don't want to overwrite the URI at all as it needs to be ws */</span><br><span>@@ -129,9 +129,7 @@</span><br><span>                               break;</span><br><span>                       }</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       } else if (pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, &pjsip_register_method)) {</span><br><span style="color: hsl(0, 100%, 40%);">-             rr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_RECORD_ROUTE, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-    } else {</span><br><span style="color: hsl(120, 100%, 40%);">+      } else if (!pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, &pjsip_register_method)) {</span><br><span>                 /**</span><br><span>           * Record-Route header has no meaning in REGISTER requests</span><br><span>            * and should be ignored</span><br><span>@@ -147,6 +145,9 @@</span><br><span>                * hope for the best</span><br><span>                  */</span><br><span>          pubsub = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+           if (rdata->msg_info.msg->type != PJSIP_RESPONSE_MSG) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  rr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_RECORD_ROUTE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span>    }</span><br><span> </span><br><span>        if (rr) {</span><br><span>diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c</span><br><span>index 4f47a8c..1b882da 100644</span><br><span>--- a/res/res_pjsip_transport_websocket.c</span><br><span>+++ b/res/res_pjsip_transport_websocket.c</span><br><span>@@ -454,7 +454,7 @@</span><br><span>                             pj_strbuf(txp_str));</span><br><span>                 }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           pj_cstr(&uri->host, rdata->pkt_info.src_name);</span><br><span style="color: hsl(120, 100%, 40%);">+              pj_strdup2(rdata->tp_info.pool, &uri->host, rdata->pkt_info.src_name);</span><br><span>          uri->port = rdata->pkt_info.src_port;</span><br><span>          pj_strdup(rdata->tp_info.pool, &uri->transport_param, txp_str);</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15209">change 15209</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/+/15209"/><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: Ic5acd7fa2fbda3080f5f36ef12e46804939b198b </div>
<div style="display:none"> Gerrit-Change-Number: 15209 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: nappsoft <infos@nappsoft.ch> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>