Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/IOBuffer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ export class IOBuffer {
): InstanceType<TypedArrays[T]> {
const bytes = typedArrays[type].BYTES_PER_ELEMENT * size;
const offset = this.byteOffset + this.offset;
const slice = this.buffer.slice(offset, offset + bytes);
if (
this.littleEndian === hostBigEndian &&
type !== 'uint8' &&
Expand All @@ -310,7 +309,18 @@ export class IOBuffer {
returnArray.reverse();
return returnArray as InstanceType<TypedArrays[T]>;
}
const returnArray = new typedArrays[type](slice);

let returnArray = null;
if (
typedArrays[type].BYTES_PER_ELEMENT === 1 ||
offset % typedArrays[type].BYTES_PER_ELEMENT === 0
) {
returnArray = new typedArrays[type](this.buffer, offset, size);
} else {
const slice = this.buffer.slice(offset, offset + bytes);
returnArray = new typedArrays[type](slice);
}

this.offset += bytes;
return returnArray as InstanceType<TypedArrays[T]>;
}
Expand Down
17 changes: 17 additions & 0 deletions src/__tests__/readArray.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,21 @@ describe('readArray', () => {
expect(resBE[0]).toBe(firstNumber);
expect(resBE[1]).toBe(secondNumber);
});
it('offset not multiple', () => {
const buffer = new IOBuffer(new Uint8Array([1, 2, 3, 4, 5, 6]));

//offset is multiple
buffer.offset = 2;
const res = buffer.readArray(2, 'int16');
expect(buffer.offset).toBe(6);
expect(res[0]).toBe(3 + (4 << 8));
expect(res[1]).toBe(5 + (6 << 8));

//offset is not multiple and make sure that we don't have such error `start offset of Int16Array should be a multiple of 2`
buffer.offset = 1;
const resNotMultipleOffset = buffer.readArray(2, 'int16');
expect(buffer.offset).toBe(5);
expect(resNotMultipleOffset[0]).toBe(2 + (3 << 8));
expect(resNotMultipleOffset[1]).toBe(4 + (5 << 8));
});
});