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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_04_11: use gsm48_decode_bcd_number2(), evaluate rc<br><br>Avoid deprecation warning: use gsm48_decode_bcd_number2() instead of<br>gsm48_decode_bcd_number().<br><br>Validate the return value and add error handling.<br><br>Change-Id: Ibef71c46d72d2d43123e68f73e5ed554a69243d8<br>---<br>M src/libmsc/gsm_04_11.c<br>1 file changed, 6 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index 71069dc..85b861c 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -526,8 +526,12 @@</span><br><span>         gsms->dst.ton = (address_lv[1] >> 4) & 7;</span><br><span>       gsms->dst.npi = address_lv[1] & 0xF;</span><br><span>  /* convert to real number */</span><br><span style="color: hsl(0, 100%, 40%);">-    gsm48_decode_bcd_number(gsms->dst.addr,</span><br><span style="color: hsl(0, 100%, 40%);">-                              sizeof(gsms->dst.addr), address_lv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (gsm48_decode_bcd_number2(gsms->dst.addr,</span><br><span style="color: hsl(120, 100%, 40%);">+                                    sizeof(gsms->dst.addr), address_lv, da_len_bytes, 1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+               LOG_TRANS(trans, LOGL_ERROR, "Failed to decode destination Address\n");</span><br><span style="color: hsl(120, 100%, 40%);">+             rc = GSM411_RP_CAUSE_SEMANT_INC_MSG;</span><br><span style="color: hsl(120, 100%, 40%);">+          goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span>    smsp += da_len_bytes;</span><br><span> </span><br><span>    gsms->protocol_id = *smsp++;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13881">change 13881</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/13881"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ibef71c46d72d2d43123e68f73e5ed554a69243d8 </div>
<div style="display:none"> Gerrit-Change-Number: 13881 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </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: Vadim Yanitskiy <axilirator@gmail.com> </div>