Rooba
/
flatbuffers
mirror of https://github.com/google/flatbuffers.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #4180: Long.prototype.toFloat64() overflow (#4182)

This commit is contained in:
litianzhao 2017-02-21 03:20:56 +08:00 committed by Wouter van Oortmerssen
parent 6561c7a31f
commit ebcfbbadf0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/flatbuffers.js
View File

@ -115,7 +115,7 @@ flatbuffers.Long.create = function(low, high) {
* @returns {number} * @returns {number}
*/ */
flatbuffers.Long.prototype.toFloat64 = function() { flatbuffers.Long.prototype.toFloat64 = function() {
return this.low + this.high * 0x100000000; return (this.low >>> 0) + this.high * 0x100000000;
}; };
/** /**

8
tests/JavaScriptTest.js
View File

@ -67,7 +67,7 @@ function main() {
// Tests mutation first. This will verify that we did not trample any other // Tests mutation first. This will verify that we did not trample any other
// part of the byte buffer. // part of the byte buffer.
testMutation(fbb.dataBuffer()); testMutation(fbb.dataBuffer());
testBuffer(fbb.dataBuffer()); testBuffer(fbb.dataBuffer());
test64bit(); test64bit();
@ -156,7 +156,8 @@ function test64bit() {
var mon2 = MyGame.Example.Monster.endMonster(fbb); var mon2 = MyGame.Example.Monster.endMonster(fbb);
MyGame.Example.Stat.startStat(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); var stat = MyGame.Example.Stat.endStat(fbb);
MyGame.Example.Monster.startMonster(fbb); MyGame.Example.Monster.startMonster(fbb);
@ -177,8 +178,7 @@ function test64bit() {
var stat = mon.testempty(); var stat = mon.testempty();
assert.strictEqual(stat != null, true); assert.strictEqual(stat != null, true);
assert.strictEqual(stat.val() != null, true); assert.strictEqual(stat.val() != null, true);
assert.strictEqual(stat.val().low, 0x12345678); assert.strictEqual(stat.val().toFloat64(), 2541551405100253985);
assert.strictEqual(stat.val().high, 0x23456789);
var mon2 = mon.enemy(); var mon2 = mon.enemy();
assert.strictEqual(mon2 != null, true); assert.strictEqual(mon2 != null, true);