A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
fuzzing: Prevent division by zero in table_ops fixup (#11837)
jiang19978bdabcdc9e5e
diff --git a/crates/fuzzing/src/generators/table_ops.rs b/crates/fuzzing/src/generators/table_ops.rsindex 88b631006c..6dbe3df5ae 100644--- a/crates/fuzzing/src/generators/table_ops.rs+++ b/crates/fuzzing/src/generators/table_ops.rs@@ -319,6 +319,20 @@ impl TableOps {let mut stack = 0;for mut op in self.ops.iter().copied() {+ if self.limits.max_types == 0 && matches!(op, TableOp::StructNew(..)) {+ continue;+ }+ if self.limits.num_params == 0+ && matches!(op, TableOp::LocalGet(..) | TableOp::LocalSet(..))+ {+ continue;+ }+ if self.limits.num_globals == 0+ && matches!(op, TableOp::GlobalGet(..) | TableOp::GlobalSet(..))+ {+ continue;+ }+op.fixup(&self.limits);let mut temp = SmallVec::<[_; 4]>::new();@@ -749,6 +763,63 @@ mod tests {Ok(())}+ #[test]+ fn struct_new_removed_when_no_types() -> mutatis::Result<()> {+ let _ = env_logger::try_init();++ let mut ops = test_ops(0, 0, 0);+ ops.limits.max_types = 0;+ ops.ops = vec![TableOp::StructNew(42)];++ let _ = ops.fixup();++ assert!(+ ops.ops+ .iter()+ .all(|op| !matches!(op, TableOp::StructNew(..))),+ "StructNew should be removed when there are no types"+ );+ Ok(())+ }++ #[test]+ fn local_ops_removed_when_no_params() -> mutatis::Result<()> {+ let _ = env_logger::try_init();++ let mut ops = test_ops(0, 0, 0);+ ops.limits.num_params = 0;+ ops.ops = vec![TableOp::LocalGet(42), TableOp::LocalSet(99)];++ ops.fixup();++ assert!(+ ops.ops+ .iter()+ .all(|op| !matches!(op, TableOp::LocalGet(..) | TableOp::LocalSet(..))),+ "LocalGet/LocalSet should be removed when there are no params"+ );+ Ok(())+ }++ #[test]+ fn global_ops_removed_when_no_globals() -> mutatis::Result<()> {+ let _ = env_logger::try_init();++ let mut ops = test_ops(0, 0, 0);+ ops.limits.num_globals = 0;+ ops.ops = vec![TableOp::GlobalGet(42), TableOp::GlobalSet(99)];++ ops.fixup();++ assert!(+ ops.ops+ .iter()+ .all(|op| !matches!(op, TableOp::GlobalGet(..) | TableOp::GlobalSet(..))),+ "GlobalGet/GlobalSet should be removed when there are no globals"+ );+ Ok(())+ }+#[test]fn every_op_generated() -> mutatis::Result<()> {let _ = env_logger::try_init();