buffer: use a default offset

If none is provided, use zero as a default offset for all read/write operations on the buffer. PR-URL: nodejs#19749 Refs: nodejs#18395 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
BridgeAR · Apr 13, 2018 · d5495e8 · d5495e8
1 parent a25f567
commit d5495e8
Show file tree

Hide file tree

Showing 8 changed files with 134 additions and 70 deletions.
diff --git a/lib/internal/buffer.js b/lib/internal/buffer.js
diff --git a/test/parallel/test-buffer-readdouble.js b/test/parallel/test-buffer-readdouble.js
@@ -99,7 +99,12 @@ assert.strictEqual(buffer.readDoubleBE(0), 3.04814e-319);
 assert.strictEqual(buffer.readDoubleLE(0), -Infinity);
 
 ['readDoubleLE', 'readDoubleBE'].forEach((fn) => {
-  ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((off) => {
+
+  // Verify that default offset works fine.
+  buffer[fn](undefined);
+  buffer[fn]();
+
+  ['', '0', null, {}, [], () => {}, true, false].forEach((off) => {
     assert.throws(
       () => buffer[fn](off),
       { code: 'ERR_INVALID_ARG_TYPE' }

diff --git a/test/parallel/test-buffer-readfloat.js b/test/parallel/test-buffer-readfloat.js
@@ -62,7 +62,12 @@ assert.strictEqual(buffer.readFloatBE(0), 4.627507918739843e-41);
 assert.strictEqual(buffer.readFloatLE(0), -Infinity);
 
 ['readFloatLE', 'readFloatBE'].forEach((fn) => {
-  ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((off) => {
+
+  // Verify that default offset works fine.
+  buffer[fn](undefined);
+  buffer[fn]();
+
+  ['', '0', null, {}, [], () => {}, true, false].forEach((off) => {
     assert.throws(
       () => buffer[fn](off),
       { code: 'ERR_INVALID_ARG_TYPE' }

diff --git a/test/parallel/test-buffer-readint.js b/test/parallel/test-buffer-readint.js
@@ -8,7 +8,12 @@ const assert = require('assert');
   const buffer = Buffer.alloc(4);
 
   ['Int8', 'Int16BE', 'Int16LE', 'Int32BE', 'Int32LE'].forEach((fn) => {
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((o) => {
+
+    // Verify that default offset works fine.
+    buffer[`read${fn}`](undefined);
+    buffer[`read${fn}`]();
+
+    ['', '0', null, {}, [], () => {}, true, false].forEach((o) => {
       assert.throws(
         () => buffer[`read${fn}`](o),
         {
@@ -129,7 +134,13 @@ const assert = require('assert');
 
   // Check byteLength.
   ['readIntBE', 'readIntLE'].forEach((fn) => {
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((len) => {
+
+    // Verify that default offset & byteLength works fine.
+    buffer[fn](undefined, undefined);
+    buffer[fn](undefined);
+    buffer[fn]();
+
+    ['', '0', null, {}, [], () => {}, true, false].forEach((len) => {
       assert.throws(
         () => buffer[fn](0, len),
         { code: 'ERR_INVALID_ARG_TYPE' });
@@ -160,7 +171,7 @@ const assert = require('assert');
   // Test 1 to 6 bytes.
   for (let i = 1; i < 6; i++) {
     ['readIntBE', 'readIntLE'].forEach((fn) => {
-      ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((o) => {
+      ['', '0', null, {}, [], () => {}, true, false].forEach((o) => {
         assert.throws(
           () => buffer[fn](o, i),
           {

diff --git a/test/parallel/test-buffer-writedouble.js b/test/parallel/test-buffer-writedouble.js
@@ -80,6 +80,11 @@ assert.ok(Number.isNaN(buffer.readDoubleLE(8)));
   const small = Buffer.allocUnsafe(1);
 
   ['writeDoubleLE', 'writeDoubleBE'].forEach((fn) => {
+
+    // Verify that default offset works fine.
+    buffer[fn](23, undefined);
+    buffer[fn](23);
+
     assert.throws(
       () => small[fn](11.11, 0),
       {
@@ -88,7 +93,7 @@ assert.ok(Number.isNaN(buffer.readDoubleLE(8)));
         message: 'Attempt to write outside buffer bounds'
       });
 
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((off) => {
+    ['', '0', null, {}, [], () => {}, true, false].forEach((off) => {
       assert.throws(
         () => small[fn](23, off),
         { code: 'ERR_INVALID_ARG_TYPE' });

diff --git a/test/parallel/test-buffer-writefloat.js b/test/parallel/test-buffer-writefloat.js
@@ -61,6 +61,11 @@ assert.ok(Number.isNaN(buffer.readFloatLE(4)));
   const small = Buffer.allocUnsafe(1);
 
   ['writeFloatLE', 'writeFloatBE'].forEach((fn) => {
+
+    // Verify that default offset works fine.
+    buffer[fn](23, undefined);
+    buffer[fn](23);
+
     assert.throws(
       () => small[fn](11.11, 0),
       {
@@ -69,7 +74,7 @@ assert.ok(Number.isNaN(buffer.readFloatLE(4)));
         message: 'Attempt to write outside buffer bounds'
       });
 
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((off) => {
+    ['', '0', null, {}, [], () => {}, true, false].forEach((off) => {
       assert.throws(
         () => small[fn](23, off),
         { code: 'ERR_INVALID_ARG_TYPE' }

diff --git a/test/parallel/test-buffer-writeint.js b/test/parallel/test-buffer-writeint.js
@@ -31,7 +31,11 @@ const errorOutOfBounds = common.expectsError({
     buffer.writeInt8(-0x80 - 1, 0);
   }, errorOutOfBounds);
 
-  ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((off) => {
+  // Verify that default offset works fine.
+  buffer.writeInt8(23, undefined);
+  buffer.writeInt8(23);
+
+  ['', '0', null, {}, [], () => {}, true, false].forEach((off) => {
     assert.throws(
       () => buffer.writeInt8(23, off),
       { code: 'ERR_INVALID_ARG_TYPE' });
@@ -70,14 +74,19 @@ const errorOutOfBounds = common.expectsError({
   assert.ok(buffer.equals(new Uint8Array([ 0xff, 0x7f, 0x00, 0x80 ])));
 
   ['writeInt16BE', 'writeInt16LE'].forEach((fn) => {
+
+    // Verify that default offset works fine.
+    buffer[fn](23, undefined);
+    buffer[fn](23);
+
     assert.throws(() => {
       buffer[fn](0x7fff + 1, 0);
     }, errorOutOfBounds);
     assert.throws(() => {
       buffer[fn](-0x8000 - 1, 0);
     }, errorOutOfBounds);
 
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((off) => {
+    ['', '0', null, {}, [], () => {}, true, false].forEach((off) => {
       assert.throws(
         () => buffer[fn](23, off),
         { code: 'ERR_INVALID_ARG_TYPE' });
@@ -127,14 +136,19 @@ const errorOutOfBounds = common.expectsError({
   ])));
 
   ['writeInt32BE', 'writeInt32LE'].forEach((fn) => {
+
+    // Verify that default offset works fine.
+    buffer[fn](23, undefined);
+    buffer[fn](23);
+
     assert.throws(() => {
       buffer[fn](0x7fffffff + 1, 0);
     }, errorOutOfBounds);
     assert.throws(() => {
       buffer[fn](-0x80000000 - 1, 0);
     }, errorOutOfBounds);
 
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((off) => {
+    ['', '0', null, {}, [], () => {}, true, false].forEach((off) => {
       assert.throws(
         () => buffer[fn](23, off),
         { code: 'ERR_INVALID_ARG_TYPE' });
@@ -154,9 +168,15 @@ const errorOutOfBounds = common.expectsError({
 
   // Check byteLength.
   ['writeIntBE', 'writeIntLE'].forEach((fn) => {
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((o) => {
+
+    // Verify that default offset & byteLength works fine.
+    data[fn](undefined, undefined);
+    data[fn](undefined);
+    data[fn]();
+
+    ['', '0', null, {}, [], () => {}, true, false].forEach((bl) => {
       assert.throws(
-        () => data[fn](23, 0, o),
+        () => data[fn](23, 0, bl),
         { code: 'ERR_INVALID_ARG_TYPE' });
     });
 
@@ -200,7 +220,7 @@ const errorOutOfBounds = common.expectsError({
         });
       });
 
-      ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((o) => {
+      ['', '0', null, {}, [], () => {}, true, false].forEach((o) => {
         assert.throws(
           () => data[fn](min, o, i),
           {

diff --git a/test/parallel/test-buffer-writeuint.js b/test/parallel/test-buffer-writeuint.js
@@ -14,7 +14,12 @@ const assert = require('assert');
 { // OOB
   const data = Buffer.alloc(8);
   ['UInt8', 'UInt16BE', 'UInt16LE', 'UInt32BE', 'UInt32LE'].forEach((fn) => {
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((o) => {
+
+    // Verify that default offset works fine.
+    data[`write${fn}`](23, undefined);
+    data[`write${fn}`](23);
+
+    ['', '0', null, {}, [], () => {}, true, false].forEach((o) => {
       assert.throws(
         () => data[`write${fn}`](23, o),
         { code: 'ERR_INVALID_ARG_TYPE' });
@@ -112,9 +117,15 @@ const assert = require('assert');
 
   // Check byteLength.
   ['writeUIntBE', 'writeUIntLE'].forEach((fn) => {
-    ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((o) => {
+
+    // Verify that default offset & byteLength works fine.
+    data[fn](undefined, undefined);
+    data[fn](undefined);
+    data[fn]();
+
+    ['', '0', null, {}, [], () => {}, true, false].forEach((bl) => {
       assert.throws(
-        () => data[fn](23, 0, o),
+        () => data[fn](23, 0, bl),
         { code: 'ERR_INVALID_ARG_TYPE' });
     });
 
@@ -153,7 +164,7 @@ const assert = require('assert');
                  `It must be >= 0 and <= ${val - 1}. Received ${val}`
       });
 
-      ['', '0', null, undefined, {}, [], () => {}, true, false].forEach((o) => {
+      ['', '0', null, {}, [], () => {}, true, false].forEach((o) => {
         assert.throws(
           () => data[fn](23, o, i),
           {