From be2fb04e763257db0a408b760a6b7c44068fe450 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 17 Jan 2018 23:08:52 +0100 Subject: [PATCH] buffer: coerce offset to integer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The offset was formerly coerced to a integer and this reimplements that. PR-URL: https://github.com/nodejs/node/pull/18215 Fixes: https://github.com/nodejs/node/issues/18208 Reviewed-By: Anna Henningsen Reviewed-By: Ben Noordhuis Reviewed-By: Richard Lau Reviewed-By: Colin Ihrig Reviewed-By: Tobias Nießen --- lib/buffer.js | 4 + test/parallel/test-readdouble.js | 197 +++++++++++++++---------------- 2 files changed, 102 insertions(+), 99 deletions(-) diff --git a/lib/buffer.js b/lib/buffer.js index cd36586ee3b3ac..ddbdbb6d03e531 100644 --- a/lib/buffer.js +++ b/lib/buffer.js @@ -1242,6 +1242,7 @@ function toFloat(x) { Buffer.prototype.readDoubleBE = function(offset, noAssert) { + offset = offset >>> 0; const x1 = this.readUInt32BE(offset + 0, noAssert); const x0 = this.readUInt32BE(offset + 4, noAssert); return toDouble(x0, x1); @@ -1249,6 +1250,7 @@ Buffer.prototype.readDoubleBE = function(offset, noAssert) { Buffer.prototype.readDoubleLE = function(offset, noAssert) { + offset = offset >>> 0; const x0 = this.readUInt32LE(offset + 0, noAssert); const x1 = this.readUInt32LE(offset + 4, noAssert); return toDouble(x0, x1); @@ -1256,11 +1258,13 @@ Buffer.prototype.readDoubleLE = function(offset, noAssert) { Buffer.prototype.readFloatBE = function(offset, noAssert) { + offset = offset >>> 0; return toFloat(this.readUInt32BE(offset, noAssert)); }; Buffer.prototype.readFloatLE = function(offset, noAssert) { + offset = offset >>> 0; return toFloat(this.readUInt32LE(offset, noAssert)); }; diff --git a/test/parallel/test-readdouble.js b/test/parallel/test-readdouble.js index 76b259ba498a6d..9096543601c1a2 100644 --- a/test/parallel/test-readdouble.js +++ b/test/parallel/test-readdouble.js @@ -29,102 +29,101 @@ const assert = require('assert'); /* * Test (64 bit) double */ -function test(clazz) { - const buffer = new clazz(8); - - buffer[0] = 0x55; - buffer[1] = 0x55; - buffer[2] = 0x55; - buffer[3] = 0x55; - buffer[4] = 0x55; - buffer[5] = 0x55; - buffer[6] = 0xd5; - buffer[7] = 0x3f; - assert.strictEqual(1.1945305291680097e+103, buffer.readDoubleBE(0)); - assert.strictEqual(0.3333333333333333, buffer.readDoubleLE(0)); - - buffer[0] = 1; - buffer[1] = 0; - buffer[2] = 0; - buffer[3] = 0; - buffer[4] = 0; - buffer[5] = 0; - buffer[6] = 0xf0; - buffer[7] = 0x3f; - assert.strictEqual(7.291122019655968e-304, buffer.readDoubleBE(0)); - assert.strictEqual(1.0000000000000002, buffer.readDoubleLE(0)); - - buffer[0] = 2; - assert.strictEqual(4.778309726801735e-299, buffer.readDoubleBE(0)); - assert.strictEqual(1.0000000000000004, buffer.readDoubleLE(0)); - - buffer[0] = 1; - buffer[6] = 0; - buffer[7] = 0; - assert.strictEqual(7.291122019556398e-304, buffer.readDoubleBE(0)); - assert.strictEqual(5e-324, buffer.readDoubleLE(0)); - - buffer[0] = 0xff; - buffer[1] = 0xff; - buffer[2] = 0xff; - buffer[3] = 0xff; - buffer[4] = 0xff; - buffer[5] = 0xff; - buffer[6] = 0x0f; - buffer[7] = 0x00; - assert.ok(Number.isNaN(buffer.readDoubleBE(0))); - assert.strictEqual(2.225073858507201e-308, buffer.readDoubleLE(0)); - - buffer[6] = 0xef; - buffer[7] = 0x7f; - assert.ok(Number.isNaN(buffer.readDoubleBE(0))); - assert.strictEqual(1.7976931348623157e+308, buffer.readDoubleLE(0)); - - buffer[0] = 0; - buffer[1] = 0; - buffer[2] = 0; - buffer[3] = 0; - buffer[4] = 0; - buffer[5] = 0; - buffer[6] = 0xf0; - buffer[7] = 0x3f; - assert.strictEqual(3.03865e-319, buffer.readDoubleBE(0)); - assert.strictEqual(1, buffer.readDoubleLE(0)); - - buffer[6] = 0; - buffer[7] = 0x40; - assert.strictEqual(3.16e-322, buffer.readDoubleBE(0)); - assert.strictEqual(2, buffer.readDoubleLE(0)); - - buffer[7] = 0xc0; - assert.strictEqual(9.5e-322, buffer.readDoubleBE(0)); - assert.strictEqual(-2, buffer.readDoubleLE(0)); - - buffer[6] = 0x10; - buffer[7] = 0; - assert.strictEqual(2.0237e-320, buffer.readDoubleBE(0)); - assert.strictEqual(2.2250738585072014e-308, buffer.readDoubleLE(0)); - - buffer[6] = 0; - assert.strictEqual(0, buffer.readDoubleBE(0)); - assert.strictEqual(0, buffer.readDoubleLE(0)); - assert.strictEqual(false, 1 / buffer.readDoubleLE(0) < 0); - - buffer[7] = 0x80; - assert.strictEqual(6.3e-322, buffer.readDoubleBE(0)); - assert.strictEqual(0, buffer.readDoubleLE(0)); - assert.strictEqual(true, 1 / buffer.readDoubleLE(0) < 0); - - buffer[6] = 0xf0; - buffer[7] = 0x7f; - assert.strictEqual(3.0418e-319, buffer.readDoubleBE(0)); - assert.strictEqual(Infinity, buffer.readDoubleLE(0)); - - buffer[6] = 0xf0; - buffer[7] = 0xff; - assert.strictEqual(3.04814e-319, buffer.readDoubleBE(0)); - assert.strictEqual(-Infinity, buffer.readDoubleLE(0)); -} - - -test(Buffer); +const buffer = Buffer.allocUnsafe(8); + +buffer[0] = 0x55; +buffer[1] = 0x55; +buffer[2] = 0x55; +buffer[3] = 0x55; +buffer[4] = 0x55; +buffer[5] = 0x55; +buffer[6] = 0xd5; +buffer[7] = 0x3f; +assert.strictEqual(1.1945305291680097e+103, buffer.readDoubleBE(0)); +assert.strictEqual(0.3333333333333333, buffer.readDoubleLE(0)); + +buffer[0] = 1; +buffer[1] = 0; +buffer[2] = 0; +buffer[3] = 0; +buffer[4] = 0; +buffer[5] = 0; +buffer[6] = 0xf0; +buffer[7] = 0x3f; +assert.strictEqual(7.291122019655968e-304, buffer.readDoubleBE(0)); +assert.strictEqual(1.0000000000000002, buffer.readDoubleLE(0)); + +buffer[0] = 2; +assert.strictEqual(4.778309726801735e-299, buffer.readDoubleBE(0)); +assert.strictEqual(1.0000000000000004, buffer.readDoubleLE(0)); + +buffer[0] = 1; +buffer[6] = 0; +buffer[7] = 0; +assert.strictEqual(7.291122019556398e-304, buffer.readDoubleBE(0)); +assert.strictEqual(5e-324, buffer.readDoubleLE(0)); + +buffer[0] = 0xff; +buffer[1] = 0xff; +buffer[2] = 0xff; +buffer[3] = 0xff; +buffer[4] = 0xff; +buffer[5] = 0xff; +buffer[6] = 0x0f; +buffer[7] = 0x00; +assert.ok(Number.isNaN(buffer.readDoubleBE(0))); +assert.strictEqual(2.225073858507201e-308, buffer.readDoubleLE(0)); + +buffer[6] = 0xef; +buffer[7] = 0x7f; +assert.ok(Number.isNaN(buffer.readDoubleBE(0))); +assert.strictEqual(1.7976931348623157e+308, buffer.readDoubleLE(0)); + +buffer[0] = 0; +buffer[1] = 0; +buffer[2] = 0; +buffer[3] = 0; +buffer[4] = 0; +buffer[5] = 0; +buffer[6] = 0xf0; +buffer[7] = 0x3f; +assert.strictEqual(3.03865e-319, buffer.readDoubleBE(0)); +assert.strictEqual(1, buffer.readDoubleLE(0)); + +buffer[6] = 0; +buffer[7] = 0x40; +assert.strictEqual(3.16e-322, buffer.readDoubleBE(0)); +assert.strictEqual(2, buffer.readDoubleLE(0)); + +buffer[7] = 0xc0; +assert.strictEqual(9.5e-322, buffer.readDoubleBE(0)); +assert.strictEqual(-2, buffer.readDoubleLE(0)); + +buffer[6] = 0x10; +buffer[7] = 0; +assert.strictEqual(2.0237e-320, buffer.readDoubleBE(0)); +assert.strictEqual(2.2250738585072014e-308, buffer.readDoubleLE(0)); + +buffer[6] = 0; +assert.strictEqual(0, buffer.readDoubleBE(0)); +assert.strictEqual(0, buffer.readDoubleLE(0)); +assert.strictEqual(false, 1 / buffer.readDoubleLE(0) < 0); + +buffer[7] = 0x80; +assert.strictEqual(6.3e-322, buffer.readDoubleBE(0)); +assert.strictEqual(-0, buffer.readDoubleLE(0)); +assert.strictEqual(true, 1 / buffer.readDoubleLE(0) < 0); + +buffer[6] = 0xf0; +buffer[7] = 0x7f; +assert.strictEqual(3.0418e-319, buffer.readDoubleBE(0)); +assert.strictEqual(Infinity, buffer.readDoubleLE(0)); + +buffer[7] = 0xff; +assert.strictEqual(3.04814e-319, buffer.readDoubleBE(0)); +assert.strictEqual(-Infinity, buffer.readDoubleLE(0)); + +buffer.writeDoubleBE(246800); +assert.strictEqual(buffer.readDoubleBE(), 246800); +assert.strictEqual(buffer.readDoubleBE(0.7), 246800); +assert.strictEqual(buffer.readDoubleBE(NaN), 246800); \ No newline at end of file