<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13900">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hlr.c: fix possible msgb memleaks in read_cb()<br><br>Change-Id: I1226eeb24d7657e2782760fab1b49d5581ab53e2<br>---<br>M src/hlr.c<br>1 file changed, 8 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 84daa47..d9ebaf7 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -521,20 +521,24 @@</span><br><span> </span><br><span>      if (!msgb_l2(msg) || !msgb_l2len(msg)) {</span><br><span>             LOGP(DMAIN, LOGL_ERROR, "missing or empty L2 data\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                return -EINVAL; /* FIXME: msgb_free(msg); */</span><br><span style="color: hsl(120, 100%, 40%);">+          msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span>        rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup);</span><br><span>     if (rc < 0) {</span><br><span>             LOGP(DMAIN, LOGL_ERROR, "error in GSUP decode: %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">-            return rc; /* FIXME: msgb_free(msg); */</span><br><span style="color: hsl(120, 100%, 40%);">+               msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return rc;</span><br><span>   }</span><br><span> </span><br><span>        /* 3GPP TS 23.003 Section 2.2 clearly states that an IMSI with less than 5</span><br><span>    * digits is impossible.  Even 5 digits is a highly theoretical case */</span><br><span style="color: hsl(0, 100%, 40%);">- if (strlen(gsup.imsi) < 5) {</span><br><span style="color: hsl(120, 100%, 40%);">+       if (strlen(gsup.imsi) < 5) { /* TODO: move this check to libosmogsm/gsup.c? */</span><br><span>            LOGP(DMAIN, LOGL_ERROR, "IMSI too short: %s\n", osmo_quote_str(gsup.imsi, -1));</span><br><span style="color: hsl(0, 100%, 40%);">-               return gsup_send_err_reply(conn, gsup.imsi, gsup.message_type, GMM_CAUSE_INV_MAND_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+              gsup_send_err_reply(conn, gsup.imsi, gsup.message_type, GMM_CAUSE_INV_MAND_INFO);</span><br><span style="color: hsl(120, 100%, 40%);">+             msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return -EINVAL;</span><br><span>      }</span><br><span> </span><br><span>        if (gsup.destination_name_len)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13900">change 13900</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/13900"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1226eeb24d7657e2782760fab1b49d5581ab53e2 </div>
<div style="display:none"> Gerrit-Change-Number: 13900 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>