RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:07:45 +00:00
Code Issues Activity Actions

LibJS: Add overflow checks when creating TypedArray from ArrayBuffer

Browse source 
Thanks to Iliad for finding this! :^)
This commit is contained in:
Andreas Kling 2021-01-27 07:50:46 +01:00
parent c899ace3ad
commit f6c6047e49
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Libraries/LibJS/Runtime/TypedArray.cpp
View file

@ -54,7 +54,7 @@ static void initialize_typed_array_from_array_buffer(GlobalObject& global_object
} }
// FIXME: 8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception. // FIXME: 8. If IsDetachedBuffer(buffer) is true, throw a TypeError exception.
auto buffer_byte_length = array_buffer.byte_length(); auto buffer_byte_length = array_buffer.byte_length();
size_t new_byte_length; Checked<size_t> new_byte_length;
if (length.is_undefined()) { if (length.is_undefined()) {
if (buffer_byte_length % element_size != 0) { if (buffer_byte_length % element_size != 0) {
vm.throw_exception<RangeError>(global_object, ErrorType::TypedArrayInvalidBufferLength, typed_array.class_name(), element_size, buffer_byte_length); vm.throw_exception<RangeError>(global_object, ErrorType::TypedArrayInvalidBufferLength, typed_array.class_name(), element_size, buffer_byte_length);
@ -64,18 +64,34 @@ static void initialize_typed_array_from_array_buffer(GlobalObject& global_object
vm.throw_exception<RangeError>(global_object, ErrorType::TypedArrayOutOfRangeByteOffset, offset, buffer_byte_length); vm.throw_exception<RangeError>(global_object, ErrorType::TypedArrayOutOfRangeByteOffset, offset, buffer_byte_length);
return; return;
} }
new_byte_length = buffer_byte_length - offset; new_byte_length = buffer_byte_length;
new_byte_length -= offset;
} else { } else {
new_byte_length = new_length * element_size; new_byte_length = new_length;
if (offset + new_byte_length > buffer_byte_length) { new_byte_length *= element_size;
vm.throw_exception<RangeError>(global_object, ErrorType::TypedArrayOutOfRangeByteOffsetOrLength, offset, offset + new_byte_length, buffer_byte_length);
Checked<size_t> new_byte_end = new_byte_length;
new_byte_end += offset;
if (new_byte_end.has_overflow()) {
vm.throw_exception<RangeError>(global_object, ErrorType::InvalidLength, "typed array");
return;
}
if (new_byte_end.value() > buffer_byte_length) {
vm.throw_exception<RangeError>(global_object, ErrorType::TypedArrayOutOfRangeByteOffsetOrLength, offset, new_byte_end.value(), buffer_byte_length);
return; return;
} }
} }
if (new_byte_length.has_overflow()) {
vm.throw_exception<RangeError>(global_object, ErrorType::InvalidLength, "typed array");
return;
}
typed_array.set_viewed_array_buffer(&array_buffer); typed_array.set_viewed_array_buffer(&array_buffer);
typed_array.set_byte_length(new_byte_length); typed_array.set_byte_length(new_byte_length.value());
typed_array.set_byte_offset(offset); typed_array.set_byte_offset(offset);
typed_array.set_array_length(new_byte_length / element_size); typed_array.set_array_length(new_byte_length.value() / element_size);
} }
void TypedArrayBase::visit_edges(Visitor& visitor) void TypedArrayBase::visit_edges(Visitor& visitor)

5
Userland/Libraries/LibJS/Tests/builtins/TypedArray/typed-array-from-ArrayBuffer-bad-offset.js Normal file
View file

@ -0,0 +1,5 @@
test("construct Uint32Array with zero-length ArrayBuffer and overflowing offset", () => {
expect(() => new Uint32Array(new ArrayBuffer(0), 4, 1024 * 1024 * 1024 - 1)).toThrow(
RangeError
);
});