<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13836">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc_filter.c: Return NULL instead of zero in bsc_nat_parse<br><br>Change-Id: I7a0ca6067bb1708d4aec28f9de166ac7874f8e91<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_filter.c<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/36/13836/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c</span><br><span>index 432529e..174ec2e 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_filter.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c</span><br><span>@@ -99,22 +99,19 @@</span><br><span>       /* do a size check on the input */</span><br><span>   if (ntohs(hh->len) != msgb_l2len(msg)) {</span><br><span>          LOGP(DLINP, LOGL_ERROR, "Wrong input length?\n");</span><br><span style="color: hsl(0, 100%, 40%);">-             talloc_free(parsed);</span><br><span style="color: hsl(0, 100%, 40%);">-            return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+          goto err_free;</span><br><span>       }</span><br><span> </span><br><span>        /* analyze sccp down here */</span><br><span>         if (parsed->ipa_proto == IPAC_PROTO_SCCP) {</span><br><span>               memset(&result, 0, sizeof(result));</span><br><span>              if (sccp_parse_header(msg, &result) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 talloc_free(parsed);</span><br><span style="color: hsl(0, 100%, 40%);">-                    return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                     goto err_free;</span><br><span>               }</span><br><span> </span><br><span>                if (msg->l3h && msgb_l3len(msg) < 3) {</span><br><span>                         LOGP(DNAT, LOGL_ERROR, "Not enough space or GSM payload\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                  talloc_free(parsed);</span><br><span style="color: hsl(0, 100%, 40%);">-                    return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                     goto err_free;</span><br><span>               }</span><br><span> </span><br><span>                parsed->sccp_type = sccp_determine_msg_type(msg);</span><br><span>@@ -133,6 +130,10 @@</span><br><span>  }</span><br><span> </span><br><span>        return parsed;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+err_free:</span><br><span style="color: hsl(120, 100%, 40%);">+   talloc_free(parsed);</span><br><span style="color: hsl(120, 100%, 40%);">+  return NULL;</span><br><span> }</span><br><span> </span><br><span> /* Returns 0 if message is whitelisted (has to beforwarded by bsc-nat), 1 if</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13836">change 13836</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/13836"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7a0ca6067bb1708d4aec28f9de166ac7874f8e91 </div>
<div style="display:none"> Gerrit-Change-Number: 13836 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>