<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/18451">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">amr: fix off-by-one in osmo_amr_bwe_to_oa()<br><br>The for loop in osmo_amr_bwe_to_oa, that converts the body part of the<br>AMR payload runs one byte too far. This may cause that some of the<br>padding bits in the end are not set to zero. The loop is designed to<br>convert n-1 bytes and the nth byte is done separately at the end.<br><br>Change-Id: I91e755b83aaac722079879c026d913cc446812d1<br>---<br>M src/amr.c<br>M tests/amr/amr_test.c<br>M tests/amr/amr_test.ok<br>3 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/amr.c b/src/amr.c</span><br><span>index 980d6ad..2706432 100644</span><br><span>--- a/src/amr.c</span><br><span>+++ b/src/amr.c</span><br><span>@@ -198,7 +198,7 @@</span><br><span> return -1;</span><br><span> oa_payload_len = 2 + osmo_amr_bytes(oa_hdr->ft);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < oa_payload_len - 2; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < oa_payload_len - 3; i++) {</span><br><span> buf[i + 2] = payload[i + 1] << 2;</span><br><span> buf[i + 2] |= payload[i + 2] >> 6;</span><br><span> }</span><br><span>diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c</span><br><span>index 2f41fe9..fabf948 100644</span><br><span>--- a/tests/amr/amr_test.c</span><br><span>+++ b/tests/amr/amr_test.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> "100c1fb967f7f1fdf547bf2e61c060",</span><br><span> "0004f89d67f1160935bde1996840",</span><br><span> "0004633cc7f0630439ffe0000000",</span><br><span style="color: hsl(0, 100%, 40%);">- "0004eb81fc0758973b9edc782552",</span><br><span style="color: hsl(120, 100%, 40%);">+ "0004eb81fc0758973b9edc782550",</span><br><span> "a078ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00fc", /* sample with invalid FT */</span><br><span> "END",</span><br><span> };</span><br><span>diff --git a/tests/amr/amr_test.ok b/tests/amr/amr_test.ok</span><br><span>index af1be82..eea513b 100644</span><br><span>--- a/tests/amr/amr_test.ok</span><br><span>+++ b/tests/amr/amr_test.ok</span><br><span>@@ -143,10 +143,10 @@</span><br><span> rc: 14</span><br><span> </span><br><span> Sample No.: 20</span><br><span style="color: hsl(0, 100%, 40%);">- octet aligned: 0004eb81fc0758973b9edc782552</span><br><span style="color: hsl(0, 100%, 40%);">- 0000000000000100111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010010</span><br><span style="color: hsl(0, 100%, 40%);">- bw-efficient: 007ae07f01d625cee7b71e095480</span><br><span style="color: hsl(0, 100%, 40%);">- 0000000001111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010010000000</span><br><span style="color: hsl(120, 100%, 40%);">+ octet aligned: 0004eb81fc0758973b9edc782550</span><br><span style="color: hsl(120, 100%, 40%);">+ 0000000000000100111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010000</span><br><span style="color: hsl(120, 100%, 40%);">+ bw-efficient: 007ae07f01d625cee7b71e095400</span><br><span style="color: hsl(120, 100%, 40%);">+ 0000000001111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010000000000</span><br><span> rc: 14</span><br><span> </span><br><span> Sample No.: 21</span><br><span>@@ -162,15 +162,15 @@</span><br><span> Sample No.: 0</span><br><span> bw-efficient: f4495c7cda8f80</span><br><span> 11110100010010010101110001111100110110101000111110000000</span><br><span style="color: hsl(0, 100%, 40%);">- octet aligned: f0442571f36a3e</span><br><span style="color: hsl(0, 100%, 40%);">- 11110000010001000010010101110001111100110110101000111110</span><br><span style="color: hsl(120, 100%, 40%);">+ octet aligned: f0442571f36a3c</span><br><span style="color: hsl(120, 100%, 40%);">+ 11110000010001000010010101110001111100110110101000111100</span><br><span> rc: 7</span><br><span> </span><br><span> Sample No.: 1</span><br><span> bw-efficient: f44aaa6c969780</span><br><span> 11110100010010101010101001101100100101101001011110000000</span><br><span style="color: hsl(0, 100%, 40%);">- octet aligned: f0442aa9b25a5e</span><br><span style="color: hsl(0, 100%, 40%);">- 11110000010001000010101010101001101100100101101001011110</span><br><span style="color: hsl(120, 100%, 40%);">+ octet aligned: f0442aa9b25a5c</span><br><span style="color: hsl(120, 100%, 40%);">+ 11110000010001000010101010101001101100100101101001011100</span><br><span> rc: 7</span><br><span> </span><br><span> Sample No.: 2</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/18451">change 18451</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/c/libosmo-netif/+/18451"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I91e755b83aaac722079879c026d913cc446812d1 </div>
<div style="display:none"> Gerrit-Change-Number: 18451 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>