From ec0450e88965f7bf596b911b545df3d2b3aad7cf Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Tue, 13 Dec 2016 12:51:01 +0800 Subject: [PATCH] buffer: consistent error for length > kMaxLength - Always return the same error message(hopefully more informative) for buffer length > kMaxLength and avoid getting into V8 C++ land for unnecessary checks. - Use accurate RegExp(reusable as `common.bufferMaxSizeMsg`) in tests for this error. - Separate related tests from test-buffer-alloc. --- lib/buffer.js | 4 +++ test/common.js | 5 +++- test/parallel/test-buffer-alloc.js | 14 +++-------- test/parallel/test-buffer-over-max-length.js | 26 ++++++++++++++++++++ test/parallel/test-buffer-regression-649.js | 18 ++++++-------- test/parallel/test-buffer-slow.js | 8 +++--- 6 files changed, 49 insertions(+), 26 deletions(-) create mode 100644 test/parallel/test-buffer-over-max-length.js diff --git a/lib/buffer.js b/lib/buffer.js index 557ac867e2e0fc..9a515e3381a851 100644 --- a/lib/buffer.js +++ b/lib/buffer.js @@ -115,6 +115,9 @@ function assertSize(size) { err = new TypeError('"size" argument must be a number'); else if (size < 0) err = new RangeError('"size" argument must not be negative'); + else if (size > binding.kMaxLength) + err = new RangeError('"size" argument must not be larger ' + + 'than ' + binding.kMaxLength); if (err) { // The following hides the 'assertSize' method from the @@ -167,6 +170,7 @@ Buffer.allocUnsafeSlow = function(size) { function SlowBuffer(length) { if (+length != length) length = 0; + assertSize(+length); return createUnsafeBuffer(+length); } diff --git a/test/common.js b/test/common.js index 3c769345dd6b31..84810a007e0be8 100644 --- a/test/common.js +++ b/test/common.js @@ -6,6 +6,7 @@ const assert = require('assert'); const os = require('os'); const child_process = require('child_process'); const stream = require('stream'); +const buffer = require('buffer'); const util = require('util'); const Timer = process.binding('timer_wrap').Timer; @@ -29,7 +30,9 @@ exports.isLinux = process.platform === 'linux'; exports.isOSX = process.platform === 'darwin'; exports.enoughTestMem = os.totalmem() > 0x40000000; /* 1 Gb */ - +exports.bufferMaxSizeMsg = new RegExp('^RangeError: "size" argument' + + ' must not be larger than ' + + buffer.kMaxLength + '$'); const cpus = os.cpus(); exports.enoughTestCpu = Array.isArray(cpus) && (cpus.length > 1 || cpus[0].speed > 999); diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 6e97cf56b330df..216f9c83f7cfcb 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -3,8 +3,10 @@ const common = require('../common'); const assert = require('assert'); const vm = require('vm'); -const Buffer = require('buffer').Buffer; -const SlowBuffer = require('buffer').SlowBuffer; +const buffer = require('buffer'); +const Buffer = buffer.Buffer; +const SlowBuffer = buffer.SlowBuffer; + const b = Buffer.allocUnsafe(1024); assert.strictEqual(1024, b.length); @@ -791,10 +793,6 @@ Buffer.from(Buffer.allocUnsafe(0), 0, 0); assert(buf.equals(copy)); } -// issue GH-4331 -assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFF), RangeError); -assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFFF), RangeError); - // issue GH-5587 assert.throws(() => Buffer.alloc(8).writeFloatLE(0, 5), RangeError); assert.throws(() => Buffer.alloc(16).writeDoubleLE(0, 9), RangeError); @@ -1002,10 +1000,6 @@ assert.throws(() => Buffer.from('', 'buffer'), TypeError); } } -assert.throws(() => Buffer.allocUnsafe((-1 >>> 0) + 1), RangeError); -assert.throws(() => Buffer.allocUnsafeSlow((-1 >>> 0) + 1), RangeError); -assert.throws(() => SlowBuffer((-1 >>> 0) + 1), RangeError); - if (common.hasCrypto) { // Test truncation after decode const crypto = require('crypto'); diff --git a/test/parallel/test-buffer-over-max-length.js b/test/parallel/test-buffer-over-max-length.js new file mode 100644 index 00000000000000..e65b457958635a --- /dev/null +++ b/test/parallel/test-buffer-over-max-length.js @@ -0,0 +1,26 @@ +'use strict'; +const common = require('../common'); +const assert = require('assert'); + +const buffer = require('buffer'); +const Buffer = buffer.Buffer; +const SlowBuffer = buffer.SlowBuffer; + +const kMaxLength = buffer.kMaxLength; +const bufferMaxSizeMsg = common.bufferMaxSizeMsg; + +assert.throws(() => Buffer((-1 >>> 0) + 1), bufferMaxSizeMsg); +assert.throws(() => SlowBuffer((-1 >>> 0) + 1), bufferMaxSizeMsg); +assert.throws(() => Buffer.alloc((-1 >>> 0) + 1), bufferMaxSizeMsg); +assert.throws(() => Buffer.allocUnsafe((-1 >>> 0) + 1), bufferMaxSizeMsg); +assert.throws(() => Buffer.allocUnsafeSlow((-1 >>> 0) + 1), bufferMaxSizeMsg); + +assert.throws(() => Buffer(kMaxLength + 1), bufferMaxSizeMsg); +assert.throws(() => SlowBuffer(kMaxLength + 1), bufferMaxSizeMsg); +assert.throws(() => Buffer.alloc(kMaxLength + 1), bufferMaxSizeMsg); +assert.throws(() => Buffer.allocUnsafe(kMaxLength + 1), bufferMaxSizeMsg); +assert.throws(() => Buffer.allocUnsafeSlow(kMaxLength + 1), bufferMaxSizeMsg); + +// issue GH-4331 +assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFF), bufferMaxSizeMsg); +assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFFF), bufferMaxSizeMsg); diff --git a/test/parallel/test-buffer-regression-649.js b/test/parallel/test-buffer-regression-649.js index ab7228e84c1c13..dc6f78bebb38e7 100644 --- a/test/parallel/test-buffer-regression-649.js +++ b/test/parallel/test-buffer-regression-649.js @@ -1,18 +1,14 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const SlowBuffer = require('buffer').SlowBuffer; // Regression test for https://github.com/nodejs/node/issues/649. const len = 1422561062959; -const lenLimitMsg = new RegExp('^RangeError: (Invalid typed array length' + - '|Array buffer allocation failed' + - '|Invalid array buffer length)$'); - -assert.throws(() => Buffer(len).toString('utf8'), lenLimitMsg); -assert.throws(() => SlowBuffer(len).toString('utf8'), lenLimitMsg); -assert.throws(() => Buffer.alloc(len).toString('utf8'), lenLimitMsg); -assert.throws(() => Buffer.allocUnsafe(len).toString('utf8'), lenLimitMsg); -assert.throws(() => Buffer.allocUnsafeSlow(len).toString('utf8'), - lenLimitMsg); +const message = common.bufferMaxSizeMsg; +assert.throws(() => Buffer(len).toString('utf8'), message); +assert.throws(() => SlowBuffer(len).toString('utf8'), message); +assert.throws(() => Buffer.alloc(len).toString('utf8'), message); +assert.throws(() => Buffer.allocUnsafe(len).toString('utf8'), message); +assert.throws(() => Buffer.allocUnsafeSlow(len).toString('utf8'), message); diff --git a/test/parallel/test-buffer-slow.js b/test/parallel/test-buffer-slow.js index 7d27a9be111569..bb944ae4de784b 100644 --- a/test/parallel/test-buffer-slow.js +++ b/test/parallel/test-buffer-slow.js @@ -1,6 +1,6 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const buffer = require('buffer'); const Buffer = buffer.Buffer; @@ -51,10 +51,10 @@ assert.strictEqual(SlowBuffer('string').length, 0); // should throw with invalid length assert.throws(function() { SlowBuffer(Infinity); -}, /^RangeError: Invalid array buffer length$/); +}, common.bufferMaxSizeMsg); assert.throws(function() { SlowBuffer(-1); -}, /^RangeError: Invalid array buffer length$/); +}, /^RangeError: "size" argument must not be negative$/); assert.throws(function() { SlowBuffer(buffer.kMaxLength + 1); -}, /^RangeError: (Invalid typed array length|Array buffer allocation failed)$/); +}, common.bufferMaxSizeMsg);