Skip to content

Don't overread buffers. #303

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
PiotrSikora merged 1 commit into from
Aug 4, 2022
Merged

Don't overread buffers. #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/exports.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,13 +485,21 @@ Word get_buffer_bytes(Word type, Word start, Word length, Word ptr_ptr, Word siz
return WasmResult::BadArgument;
}
// Don't overread.
if (start + length > buffer->size()) {
if (start > buffer->size()) {
length = 0;
} else if (start + length > buffer->size()) {
length = buffer->size() - start;
}
if (length > 0) {
return buffer->copyTo(context->wasm(), start, length, ptr_ptr, size_ptr);
if (length == 0) {
if (!context->wasmVm()->setWord(ptr_ptr, Word(0))) {
return WasmResult::InvalidMemoryAccess;
}
if (!context->wasmVm()->setWord(size_ptr, Word(0))) {
return WasmResult::InvalidMemoryAccess;
}
return WasmResult::Ok;
}
return WasmResult::Ok;
return buffer->copyTo(context->wasm(), start, length, ptr_ptr, size_ptr);
}

Word get_buffer_status(Word type, Word length_ptr, Word flags_ptr) {
Expand Down