T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow at least 1 page of memory when disallowing traps (#5421)

Browse Source 
This commit fixes configuration of the pooling instance allocator when
traps are disallowed while fuzzing to ensure that there's at least one
page of memory. The support in `wasm-smith` currently forcibly creates a
1-page memory which was previously invalid in the pooling instance
allocator under the generated configuration, so this commit updates the
configuration generated to ensure that it can fit the generated module.
This commit is contained in:
Alex Crichton
2022-12-13 14:04:56 -06:00
committed by GitHub
parent 92ce79366c
commit 37ade17e2a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/fuzzing/src/generators/config.rs
View File

@@ -311,6 +311,20 @@ impl<'a> Arbitrary<'a> for Config {
cfg.max_memory_pages = pooling.instance_memory_pages;
}
// If traps are disallowed then memories must have at least one page
// of memory so if we still are only allowing 0 pages of memory then
// increase that to one here.
if cfg.disallow_traps {
if pooling.instance_memory_pages == 0 {
pooling.instance_memory_pages = 1;
cfg.max_memory_pages = 1;
}
// .. additionally update tables
if pooling.instance_table_elements == 0 {
pooling.instance_table_elements = 1;
}
}
// Forcibly don't use the `CustomUnaligned` memory configuration
// with the pooling allocator active.
if let MemoryConfig::CustomUnaligned = config.wasmtime.memory_config {