buffer: fix 6-byte writeUIntBE() range check

mscdex · targos · commit f0d43929f215 · 2019-12-05T13:54:35.000+01:00
Fixes: #30420 PR-URL: #30459 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/buffer.js b/lib/internal/buffer.js
@@ -736,7 +736,7 @@ function writeUInt8(value, offset = 0) {
 
 function writeUIntBE(value, offset, byteLength) {
 if (byteLength === 6)
- return writeU_Int48BE(this, value, offset, 0, 0xffffffffffffff);
+ return writeU_Int48BE(this, value, offset, 0, 0xffffffffffff);
 if (byteLength === 5)
 return writeU_Int40BE(this, value, offset, 0, 0xffffffffff);
 if (byteLength === 3)
diff --git a/test/parallel/test-buffer-writeint.js b/test/parallel/test-buffer-writeint.js
@@ -213,7 +213,7 @@ const errorOutOfBounds = common.expectsError({
 });
 
 // Test 1 to 6 bytes.
- for (let i = 1; i < 6; i++) {
+ for (let i = 1; i <= 6; i++) {
 ['writeIntBE', 'writeIntLE'].forEach((fn) => {
 const min = -(2 ** (i * 8 - 1));
 const max = 2 ** (i * 8 - 1) - 1;
diff --git a/test/parallel/test-buffer-writeuint.js b/test/parallel/test-buffer-writeuint.js
@@ -170,7 +170,7 @@ const assert = require('assert');
 });
 
 // Test 1 to 6 bytes.
- for (let i = 1; i < 6; i++) {
+ for (let i = 1; i <= 6; i++) {
 const range = i < 5 ? `= ${val - 1}` : ` 2 ** ${i * 8}`;
 const received = i > 4 ?
 String(val).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1_') :

-Original file line number
+Diff line change
 functionwriteUIntBE(value,offset,byteLength){
 if(byteLength===6)
 -returnwriteU_Int48BE(this,value,offset,0,0xffffffffffffff);
 +returnwriteU_Int48BE(this,value,offset,0,0xffffffffffff);
 if(byteLength===5)
 returnwriteU_Int40BE(this,value,offset,0,0xffffffffff);
 if(byteLength===3)
-Original file line number
+Diff line change
 });
 // Test 1 to 6 bytes.
 -for(leti=1;i<6;i++){
 +for(leti=1;i<=6;i++){
 ['writeIntBE','writeIntLE'].forEach((fn)=>{
 constmin=-(2**(i*8-1));
 constmax=2**(i*8-1)-1;