Skip to content

Fix wrong bound checks in TypedArray.wrap #1067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcodeIO merged 10 commits into from
Jan 22, 2020
Merged

Fix wrong bound checks in TypedArray.wrap #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3af6d68
fix wrong bounds check in TypedArray.wrap
MaxGraey Jan 21, 2020
b3ddfd3
addisinal fixes and spec compliance
MaxGraey Jan 21, 2020
cbeb87a
also check byteOffset alignment
MaxGraey Jan 21, 2020
f046a59
refactor
MaxGraey Jan 21, 2020
0b50952
again
MaxGraey Jan 21, 2020
6cab2c0
fixes
MaxGraey Jan 21, 2020
432dea5
refactor
MaxGraey Jan 21, 2020
7283867
more
MaxGraey Jan 21, 2020
8c5ebfd
refactor
MaxGraey Jan 22, 2020
63e808e
refactor
MaxGraey Jan 22, 2020
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
17 changes: 8 additions & 9 deletions std/assembly/typedarray.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,27 +1734,26 @@ function REVERSE<TArray extends ArrayBufferView, T>(array: TArray): TArray {
// @ts-ignore: decorator
@inline
function WRAP<TArray extends ArrayBufferView, T>(buffer: ArrayBuffer, byteOffset: i32 = 0, length: i32 = -1): TArray {
var byteLength: i32;
var bufferByteLength = buffer.byteLength;
if (<u32>byteOffset >= <u32>bufferByteLength) {
const mask = sizeof<T>() - 1;
if (i32(<u32>byteOffset > <u32>bufferByteLength) | (byteOffset & mask)) {
throw new RangeError(E_INDEXOUTOFRANGE);
}
var byteLength: i32;
if (length < 0) {
if (length == -1) {
const mask = <i32>(1 << alignof<T>() - 1);
if (buffer.byteLength & mask) {
if (bufferByteLength & mask) {
throw new RangeError(E_INVALIDLENGTH);
} else {
byteLength = buffer.byteLength;
}
byteLength = bufferByteLength - byteOffset;
} else {
throw new RangeError(E_INVALIDLENGTH);
}
} else {
byteLength = length << alignof<T>();
}
if (byteOffset + byteLength > buffer.byteLength) {
throw new RangeError(E_INVALIDLENGTH);
if (byteOffset + byteLength > bufferByteLength) {
Comment thread
dcodeIO marked this conversation as resolved.
throw new RangeError(E_INVALIDLENGTH);
}
}
var out = __alloc(offsetof<TArray>(), idof<TArray>());
store<usize>(out, __retain(changetype<usize>(buffer)), offsetof<TArray>("buffer"));
Expand Down
Loading