From ebcfbbadf0c18c6b59ab0b50473eacc8e3c38c5f Mon Sep 17 00:00:00 2001 From: litianzhao Date: Tue, 21 Feb 2017 03:20:56 +0800 Subject: [PATCH] fix #4180: Long.prototype.toFloat64() overflow (#4182) --- js/flatbuffers.js | 2 +- tests/JavaScriptTest.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/flatbuffers.js b/js/flatbuffers.js index 3ea1adfa1..a8b1941c4 100644 --- a/js/flatbuffers.js +++ b/js/flatbuffers.js @@ -115,7 +115,7 @@ flatbuffers.Long.create = function(low, high) { * @returns {number} */ flatbuffers.Long.prototype.toFloat64 = function() { - return this.low + this.high * 0x100000000; + return (this.low >>> 0) + this.high * 0x100000000; }; /** diff --git a/tests/JavaScriptTest.js b/tests/JavaScriptTest.js index c97ed2d08..c656974e7 100644 --- a/tests/JavaScriptTest.js +++ b/tests/JavaScriptTest.js @@ -67,7 +67,7 @@ function main() { // Tests mutation first. This will verify that we did not trample any other // part of the byte buffer. testMutation(fbb.dataBuffer()); - + testBuffer(fbb.dataBuffer()); test64bit(); @@ -156,7 +156,8 @@ function test64bit() { var mon2 = MyGame.Example.Monster.endMonster(fbb); MyGame.Example.Stat.startStat(fbb); - MyGame.Example.Stat.addVal(fbb, new flatbuffers.Long(0x12345678, 0x23456789)); + // 2541551405100253985 = 0x87654321(low part) + 0x23456789 * 0x100000000(high part); + MyGame.Example.Stat.addVal(fbb, new flatbuffers.Long(0x87654321, 0x23456789)); // the low part is Uint32 var stat = MyGame.Example.Stat.endStat(fbb); MyGame.Example.Monster.startMonster(fbb); @@ -177,8 +178,7 @@ function test64bit() { var stat = mon.testempty(); assert.strictEqual(stat != null, true); assert.strictEqual(stat.val() != null, true); - assert.strictEqual(stat.val().low, 0x12345678); - assert.strictEqual(stat.val().high, 0x23456789); + assert.strictEqual(stat.val().toFloat64(), 2541551405100253985); var mon2 = mon.enemy(); assert.strictEqual(mon2 != null, true);