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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm48_decode_bcd_number2(): return -EINVAL if LV has too big length<br><br>Change-Id: Ie07b2e8bc2f9628904e88448b4ee63b359655123<br>---<br>M src/gsm/gsm48_ie.c<br>M tests/gsm0408/gsm0408_test.c<br>M tests/gsm0408/gsm0408_test.ok<br>3 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c</span><br><span>index 311836d..688698d 100644</span><br><span>--- a/src/gsm/gsm48_ie.c</span><br><span>+++ b/src/gsm/gsm48_ie.c</span><br><span>@@ -70,7 +70,7 @@</span><br><span>  *</span><br><span>  * Errors checked:</span><br><span>  *   - no or too little input data (-EIO),</span><br><span style="color: hsl(0, 100%, 40%);">- *   - IE length exceeds input data size (-EIO),</span><br><span style="color: hsl(120, 100%, 40%);">+ *   - IE length exceeds input data size (-EINVAL),</span><br><span>  *   - no or too little output buffer size (-ENOSPC),</span><br><span>  *   - decoded number exceeds size of the output buffer (-ENOSPC).</span><br><span>  *</span><br><span>@@ -90,7 +90,7 @@</span><br><span>  in_len = bcd_lv[0];</span><br><span>  /* len + 1: the BCD length plus the length byte itself must fit in the input buffer. */</span><br><span>      if (input_len < in_len + 1)</span><br><span style="color: hsl(0, 100%, 40%);">-          return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+          return -EINVAL;</span><br><span> </span><br><span>  for (i = 1 + h_len; i <= in_len; i++) {</span><br><span>           /* lower nibble */</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index 55c9b61..d7bae77 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -712,7 +712,7 @@</span><br><span>                .test_name = "LV incorrect length",</span><br><span>                .dec_hex   = "05214365", /* should be 0x03 */</span><br><span>              .dec_ascii = "(none)",</span><br><span style="color: hsl(0, 100%, 40%);">-                .dec_rc    = -EIO,</span><br><span style="color: hsl(120, 100%, 40%);">+            .dec_rc    = -EINVAL,</span><br><span>        },</span><br><span>   {</span><br><span>            .test_name = "empty input buffer",</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok</span><br><span>index b080411..075886e 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.ok</span><br><span>+++ b/tests/gsm0408/gsm0408_test.ok</span><br><span>@@ -177,8 +177,8 @@</span><br><span>     -   Actual: (rc=-28) '123456789012345'</span><br><span> - Running test: LV incorrect length</span><br><span>   - Decoding HEX (buffer limit=0) '05214365'...</span><br><span style="color: hsl(0, 100%, 40%);">-    - Expected: (rc=-5) '(none)'</span><br><span style="color: hsl(0, 100%, 40%);">-    -   Actual: (rc=-5) '(none)'</span><br><span style="color: hsl(120, 100%, 40%);">+    - Expected: (rc=-22) '(none)'</span><br><span style="color: hsl(120, 100%, 40%);">+    -   Actual: (rc=-22) '(none)'</span><br><span> - Running test: empty input buffer</span><br><span>   - Encoding ASCII (buffer limit=0) ''...</span><br><span>     - Expected: (rc=1) '00'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14187">change 14187</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/14187"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie07b2e8bc2f9628904e88448b4ee63b359655123 </div>
<div style="display:none"> Gerrit-Change-Number: 14187 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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>