BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-01 19:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix FlexBuffers JS/TS bug https://github.com/google/flatbuffers/issues/6934 (#7434)

Browse Source 
Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
Maxim Zaks
2022-08-14 03:29:28 +02:00
committed by GitHub
parent 9dbe819efd
commit 8a09f3fb0b
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/JavaScriptFlexBuffersTest.js
View File

@@ -264,6 +264,7 @@ function testRoundTrip() {
_assert(example); _assert(example);
_assert(0x100000001n); _assert(0x100000001n);
_assert({ test_number: 72.6 })
} }
function testRoundTripWithBuilder() { function testRoundTripWithBuilder() {

12
ts/flexbuffers/reference-util.ts
View File

@@ -65,8 +65,8 @@ export function keyIndex(key: string, dataView: DataView, offset: number, parent
const input = toUTF8Array(key); const input = toUTF8Array(key);
const keysVectorOffset = indirect(dataView, offset, parentWidth) - byteWidth * 3; const keysVectorOffset = indirect(dataView, offset, parentWidth) - byteWidth * 3;
const bitWidth = fromByteWidth(byteWidth); const bitWidth = fromByteWidth(byteWidth);
const indirectOffset = keysVectorOffset - (readUInt(dataView, keysVectorOffset, bitWidth) as number); const indirectOffset = keysVectorOffset - Number(readUInt(dataView, keysVectorOffset, bitWidth));
const _byteWidth = readUInt(dataView, keysVectorOffset + byteWidth, bitWidth) as number; const _byteWidth = Number(readUInt(dataView, keysVectorOffset + byteWidth, bitWidth));
let low = 0; let low = 0;
let high = length - 1; let high = length - 1;
while (low <= high) { while (low <= high) {
@@ -84,7 +84,7 @@ export function keyIndex(key: string, dataView: DataView, offset: number, parent
export function diffKeys(input: Uint8Array, index: number, dataView: DataView, offset: number, width: number): number { export function diffKeys(input: Uint8Array, index: number, dataView: DataView, offset: number, width: number): number {
const keyOffset = offset + index * width; const keyOffset = offset + index * width;
const keyIndirectOffset = keyOffset - (readUInt(dataView, keyOffset, fromByteWidth(width)) as number); const keyIndirectOffset = keyOffset - Number(readUInt(dataView, keyOffset, fromByteWidth(width)));
for (let i = 0; i < input.length; i++) { for (let i = 0; i < input.length; i++) {
const dif = input[i] - dataView.getUint8(keyIndirectOffset + i); const dif = input[i] - dataView.getUint8(keyIndirectOffset + i);
if (dif !== 0) { if (dif !== 0) {
@@ -97,10 +97,10 @@ export function diffKeys(input: Uint8Array, index: number, dataView: DataView, o
export function keyForIndex(index: number, dataView: DataView, offset: number, parentWidth: number, byteWidth: number): string { export function keyForIndex(index: number, dataView: DataView, offset: number, parentWidth: number, byteWidth: number): string {
const keysVectorOffset = indirect(dataView, offset, parentWidth) - byteWidth * 3; const keysVectorOffset = indirect(dataView, offset, parentWidth) - byteWidth * 3;
const bitWidth = fromByteWidth(byteWidth); const bitWidth = fromByteWidth(byteWidth);
const indirectOffset = keysVectorOffset - (readUInt(dataView, keysVectorOffset, bitWidth) as number); const indirectOffset = keysVectorOffset - Number(readUInt(dataView, keysVectorOffset, bitWidth));
const _byteWidth = readUInt(dataView, keysVectorOffset + byteWidth, bitWidth) as number; const _byteWidth = Number(readUInt(dataView, keysVectorOffset + byteWidth, bitWidth));
const keyOffset = indirectOffset + index * _byteWidth; const keyOffset = indirectOffset + index * _byteWidth;
const keyIndirectOffset = keyOffset - (readUInt(dataView, keyOffset, fromByteWidth(_byteWidth)) as number); const keyIndirectOffset = keyOffset - Number(readUInt(dataView, keyOffset, fromByteWidth(_byteWidth)));
let length = 0; let length = 0;
while (dataView.getUint8(keyIndirectOffset + length) !== 0) { while (dataView.getUint8(keyIndirectOffset + length) !== 0) {
length++; length++;

2
ts/flexbuffers/reference.ts
View File

@@ -157,7 +157,7 @@ export class Reference {
} else { } else {
this._length = 1; this._length = 1;
} }
return this._length; return Number(this._length);
} }
toObject(): unknown { toObject(): unknown {