Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Use fallible allocation in `FuncType::default_value` (#13379)

Nick Fitzgerald7bba23e51a2b
diff --git a/crates/wasmtime/src/runtime/types.rs b/crates/wasmtime/src/runtime/types.rs
index 040bd0823c..3bf776c671 100644
--- a/crates/wasmtime/src/runtime/types.rs
+++ b/crates/wasmtime/src/runtime/types.rs
@@ -2724,17 +2724,19 @@ impl FuncType {
}
/// Construct a func which returns results of default value, if each result type has a default value.
pub fn default_value(&self, mut store: impl AsContextMut) -> Result<Func> {
- let dummy_results = self
- .results()
- .map(|ty| ty.default_value())
- .collect::<Option<Vec<_>>>()
- .ok_or_else(|| format_err!("function results do not have a default value"))?;
- Ok(Func::new(&mut store, self.clone(), move |_, _, results| {
+ let mut dummy_results = TryVec::new();
+ for ty in self.results() {
+ let val = ty
+ .default_value()
+ .ok_or_else(|| format_err!("function results do not have a default value"))?;
+ dummy_results.push(val)?;
+ }
+ Func::try_new(&mut store, self.clone(), move |_, _, results| {
for (slot, dummy) in results.iter_mut().zip(dummy_results.iter()) {
*slot = *dummy;
}
Ok(())
- }))
+ })
}
}