Skip to content

[threads] Validate shared-polymorphic instructions #6702

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
tlively merged 4 commits into from
Jun 25, 2024
Merged

[threads] Validate shared-polymorphic instructions #6702

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6935f99
[threads] Validate shared-polymorphic instructions
tlively Jun 25, 2024
5a9f6b5
fix
tlively Jun 25, 2024
d848bb7
add missing shared handling in binary reader
tlively Jun 25, 2024
e99ea96
trigger ci
tlively Jun 25, 2024
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
Prev Previous commit
Next Next commit
add missing shared handling in binary reader
  • Loading branch information
@tlively
tlively committed Jun 25, 2024
commit d848bb79b4493c3d279d346a61d7f0a2d82bf3d7
9 changes: 7 additions & 2 deletions src/wasm/wasm-binary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2272,11 +2272,16 @@ void WasmBinaryReader::readTypes() {
TypeBuilder builder(getU32LEB());
BYN_TRACE("num: " << builder.size() << std::endl);

auto readHeapType = [&]() {
auto readHeapType = [&]() -> HeapType {
int64_t htCode = getS64LEB(); // TODO: Actually s33
auto share = Unshared;
if (htCode == BinaryConsts::EncodedType::Shared) {
share = Shared;
htCode = getS64LEB(); // TODO: Actually s33
}
HeapType ht;
if (getBasicHeapType(htCode, ht)) {
return ht;
return ht.getBasic(share);
}
if (size_t(htCode) >= builder.size()) {
throwError("invalid type index: " + std::to_string(htCode));
Expand Down