buffer: harden SlowBuffer creation

PR-URL: #26272 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Mar 11, 2019 · 6113ba9 · 6113ba9
1 parent 560466c
commit 6113ba9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -297,8 +297,6 @@ Buffer.allocUnsafeSlow = function allocUnsafeSlow(size) {
 // If --zero-fill-buffers command line argument is set, a zero-filled
 // buffer is returned.
 function SlowBuffer(length) {
-  if (typeof length !== 'number')
-    length = +length;
   assertSize(length);
   return createUnsafeBuffer(length);
 }

diff --git a/test/parallel/test-buffer-slow.js b/test/parallel/test-buffer-slow.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const buffer = require('buffer');
 const SlowBuffer = buffer.SlowBuffer;
@@ -39,21 +39,24 @@ try {
   assert.strictEqual(e.name, 'RangeError');
 }
 
-// Should work with number-coercible values
-assert.strictEqual(SlowBuffer('6').length, 6);
-assert.strictEqual(SlowBuffer(true).length, 1);
-
-// Should throw with invalid length
-const bufferMaxSizeMsg = common.expectsError({
+// Should throw with invalid length type
+const bufferInvalidTypeMsg = {
+  code: 'ERR_INVALID_ARG_TYPE',
+  name: 'TypeError [ERR_INVALID_ARG_TYPE]',
+  message: /^The "size" argument must be of type number/,
+};
+assert.throws(() => SlowBuffer(), bufferInvalidTypeMsg);
+assert.throws(() => SlowBuffer({}), bufferInvalidTypeMsg);
+assert.throws(() => SlowBuffer('6'), bufferInvalidTypeMsg);
+assert.throws(() => SlowBuffer(true), bufferInvalidTypeMsg);
+
+// Should throw with invalid length value
+const bufferMaxSizeMsg = {
   code: 'ERR_INVALID_OPT_VALUE',
-  type: RangeError,
+  name: 'RangeError [ERR_INVALID_OPT_VALUE]',
   message: /^The value "[^"]*" is invalid for option "size"$/
-}, 7);
-
-assert.throws(() => SlowBuffer(), bufferMaxSizeMsg);
+};
 assert.throws(() => SlowBuffer(NaN), bufferMaxSizeMsg);
-assert.throws(() => SlowBuffer({}), bufferMaxSizeMsg);
-assert.throws(() => SlowBuffer('string'), bufferMaxSizeMsg);
 assert.throws(() => SlowBuffer(Infinity), bufferMaxSizeMsg);
 assert.throws(() => SlowBuffer(-1), bufferMaxSizeMsg);
 assert.throws(() => SlowBuffer(buffer.kMaxLength + 1), bufferMaxSizeMsg);