diff options
author | Ruben Bridgewater <ruben@bridgewater.de> | 2019-03-20 17:10:06 +0100 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2019-03-30 13:28:24 +0100 |
commit | 75eaf25e78fcb21b338855404b2a6082a4414911 (patch) | |
tree | 2e9c6ccd8f563c23ac96fae5b763e517ee1188bd /test/parallel/test-buffer-from.js | |
parent | ef0701d31f8d409916847b8466d5d37dc241a9a2 (diff) | |
download | android-node-v8-75eaf25e78fcb21b338855404b2a6082a4414911.tar.gz android-node-v8-75eaf25e78fcb21b338855404b2a6082a4414911.tar.bz2 android-node-v8-75eaf25e78fcb21b338855404b2a6082a4414911.zip |
buffer: use stricter `from()` input validation
So far we did not throw an error for all types of invalid input.
Functions do not return a buffer anymore and `number` and `symbol`
validation is also improved.
PR-URL: https://github.com/nodejs/node/pull/26825
Fixes: https://github.com/nodejs/node/issues/26741
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Diffstat (limited to 'test/parallel/test-buffer-from.js')
-rw-r--r-- | test/parallel/test-buffer-from.js | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/test/parallel/test-buffer-from.js b/test/parallel/test-buffer-from.js index e8a9196b3d..ec79838169 100644 --- a/test/parallel/test-buffer-from.js +++ b/test/parallel/test-buffer-from.js @@ -1,6 +1,6 @@ 'use strict'; -const common = require('../common'); +require('../common'); const { deepStrictEqual, throws } = require('assert'); const { runInNewContext } = require('vm'); @@ -40,27 +40,25 @@ deepStrictEqual( [{ valueOf() { return null; } }, 'object'], [{ valueOf() { return undefined; } }, 'object'], [{ valueOf: null }, 'object'], - [Object.create(null), 'object'] + [Object.create(null), 'object'], + [new Number(true), 'number'], + [new MyBadPrimitive(), 'number'], + [Symbol(), 'symbol'], + [5n, 'bigint'], + [(one, two, three) => {}, 'function'], + [undefined, 'undefined'], + [null, 'object'] ].forEach(([input, actualType]) => { - const err = common.expectsError({ + const errObj = { code: 'ERR_INVALID_ARG_TYPE', - type: TypeError, + name: 'TypeError', message: 'The first argument must be one of type string, Buffer, ' + 'ArrayBuffer, Array, or Array-like Object. Received ' + `type ${actualType}` - }); - throws(() => Buffer.from(input), err); + }; + throws(() => Buffer.from(input), errObj); + throws(() => Buffer.from(input, 'hex'), errObj); }); -[ - new Number(true), - new MyBadPrimitive() -].forEach((input) => { - const errMsg = common.expectsError({ - code: 'ERR_INVALID_ARG_TYPE', - type: TypeError, - message: 'The "value" argument must not be of type number. ' + - 'Received type number' - }); - throws(() => Buffer.from(input), errMsg); -}); +Buffer.allocUnsafe(10); // Should not throw. +Buffer.from('deadbeaf', 'hex'); // Should not throw. |