1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buffer: harden SlowBuffer creation

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/26272
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
ZYSzys 2019-03-04 11:02:53 +08:00 committed by Daniel Bevenius
parent 560466c773
commit 6113ba96cb
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/buffer.js
View File

@ -297,8 +297,6 @@ Buffer.allocUnsafeSlow = function allocUnsafeSlow(size) {
// If --zero-fill-buffers command line argument is set, a zero-filled // If --zero-fill-buffers command line argument is set, a zero-filled
// buffer is returned. // buffer is returned.
function SlowBuffer(length) { function SlowBuffer(length) {
if (typeof length !== 'number')
length = +length;
assertSize(length); assertSize(length);
return createUnsafeBuffer(length); return createUnsafeBuffer(length);
} }

27
test/parallel/test-buffer-slow.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const common = require('../common'); require('../common');
const assert = require('assert'); const assert = require('assert');
const buffer = require('buffer'); const buffer = require('buffer');
const SlowBuffer = buffer.SlowBuffer; const SlowBuffer = buffer.SlowBuffer;
@ -39,21 +39,24 @@ try {
assert.strictEqual(e.name, 'RangeError'); assert.strictEqual(e.name, 'RangeError');
} }
// Should work with number-coercible values // Should throw with invalid length type
assert.strictEqual(SlowBuffer('6').length, 6); const bufferInvalidTypeMsg = {
assert.strictEqual(SlowBuffer(true).length, 1); 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 // Should throw with invalid length value
const bufferMaxSizeMsg = common.expectsError({ const bufferMaxSizeMsg = {
code: 'ERR_INVALID_OPT_VALUE', code: 'ERR_INVALID_OPT_VALUE',
type: RangeError, name: 'RangeError [ERR_INVALID_OPT_VALUE]',
message: /^The value "[^"]*" is invalid for option "size"$/ message: /^The value "[^"]*" is invalid for option "size"$/
}, 7); };
assert.throws(() => SlowBuffer(), bufferMaxSizeMsg);
assert.throws(() => SlowBuffer(NaN), bufferMaxSizeMsg); assert.throws(() => SlowBuffer(NaN), bufferMaxSizeMsg);
assert.throws(() => SlowBuffer({}), bufferMaxSizeMsg);
assert.throws(() => SlowBuffer('string'), bufferMaxSizeMsg);
assert.throws(() => SlowBuffer(Infinity), bufferMaxSizeMsg); assert.throws(() => SlowBuffer(Infinity), bufferMaxSizeMsg);
assert.throws(() => SlowBuffer(-1), bufferMaxSizeMsg); assert.throws(() => SlowBuffer(-1), bufferMaxSizeMsg);
assert.throws(() => SlowBuffer(buffer.kMaxLength + 1), bufferMaxSizeMsg); assert.throws(() => SlowBuffer(buffer.kMaxLength + 1), bufferMaxSizeMsg);