A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Handle OOM in `InstancePre::instantiate` (#12853)
Nick Fitzgeraldc7d25dfd8cf0
diff --git a/crates/fuzzing/tests/oom/instance_pre.rs b/crates/fuzzing/tests/oom/instance_pre.rsnew file mode 100644index 0000000000..572c61dddb--- /dev/null+++ b/crates/fuzzing/tests/oom/instance_pre.rs@@ -0,0 +1,50 @@+#![cfg(arc_try_new)]++use wasmtime::{Config, Engine, Linker, Module, Result, Store};+use wasmtime_fuzzing::oom::OomTest;++#[test]+fn instance_pre_instantiate() -> Result<()> {+ let module_bytes = {+ let mut config = Config::new();+ config.concurrency_support(false);+ let engine = Engine::new(&config)?;+ let module = Module::new(+ &engine,+ r#"+ (module+ (import "module" "func" (func (param i32) (result i32)))++ (memory (export "memory") 1)+ (data (i32.const 0) "a")++ (table (export "table") 1 funcref)+ (elem (i32.const 0) func 1)++ (func (export "func") (param i32) (result i32)+ (call 0 (local.get 0))+ )+ )+ "#,+ )?;+ module.serialize()?+ };++ let mut config = Config::new();+ config.enable_compiler(false);+ config.concurrency_support(false);++ let engine = Engine::new(&config)?;++ let mut linker = Linker::<()>::new(&engine);+ linker.func_wrap("module", "func", |x: i32| x * 2)?;++ let module = unsafe { Module::deserialize(&engine, &module_bytes)? };+ let instance_pre = linker.instantiate_pre(&module)?;++ OomTest::new().test(|| {+ let mut store = Store::try_new(&engine, ())?;+ let _ = instance_pre.instantiate(&mut store)?;+ Ok(())+ })+}diff --git a/crates/fuzzing/tests/oom/main.rs b/crates/fuzzing/tests/oom/main.rsindex 2337f6d9a1..12da55fbaf 100644--- a/crates/fuzzing/tests/oom/main.rs+++ b/crates/fuzzing/tests/oom/main.rs@@ -12,6 +12,7 @@ mod func_type;mod hash_map;mod hash_set;mod index_map;+mod instance_pre;mod linker;mod module;mod primary_map;