From b189321d61b9c63646e7d8359337129ecf1a0312 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 9 Sep 2020 12:09:04 -0500
Subject: [PATCH] Actually add instantiate-maybe-invalid fuzz target (#2190)

Forgot to add it to the manifest so it didn't actually get built!
---
 crates/fuzzing/src/lib.rs                      | 4 +---
 fuzz/Cargo.toml                                | 6 ++++++
 fuzz/fuzz_targets/instantiate-maybe-invalid.rs | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/crates/fuzzing/src/lib.rs b/crates/fuzzing/src/lib.rs
index dc97644d9c..7e649272de 100644
--- a/crates/fuzzing/src/lib.rs
+++ b/crates/fuzzing/src/lib.rs
@@ -31,9 +31,7 @@ pub(crate) fn init_fuzzing() {
 }
 
 /// Create default fuzzing config with given strategy
-pub(crate) fn fuzz_default_config(
-    strategy: wasmtime::Strategy,
-) -> anyhow::Result<wasmtime::Config> {
+pub fn fuzz_default_config(strategy: wasmtime::Strategy) -> anyhow::Result<wasmtime::Config> {
     init_fuzzing();
     let mut config = wasmtime::Config::new();
     config
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 527e8f8aa1..b192afe70e 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -107,3 +107,9 @@ name = "instantiate-wasm-smith"
 path = "fuzz_targets/instantiate-wasm-smith.rs"
 test = false
 doc = false
+
+[[bin]]
+name = "instantiate-maybe-invalid"
+path = "fuzz_targets/instantiate-maybe-invalid.rs"
+test = false
+doc = false
diff --git a/fuzz/fuzz_targets/instantiate-maybe-invalid.rs b/fuzz/fuzz_targets/instantiate-maybe-invalid.rs
index b85b57359c..5b9657b924 100644
--- a/fuzz/fuzz_targets/instantiate-maybe-invalid.rs
+++ b/fuzz/fuzz_targets/instantiate-maybe-invalid.rs
@@ -2,14 +2,14 @@
 
 use libfuzzer_sys::fuzz_target;
 use std::time::Duration;
-use wasm_smith::Module;
+use wasm_smith::MaybeInvalidModule;
 use wasmtime::Strategy;
 use wasmtime_fuzzing::oracles;
 
 fuzz_target!(|module: MaybeInvalidModule| {
     oracles::instantiate_with_config(
         &module.to_bytes(),
-        wasmtime_fuzzing::fuzz_default_config(Strategy::Auto),
+        wasmtime_fuzzing::fuzz_default_config(Strategy::Auto).unwrap(),
         Some(Duration::from_secs(20)),
     );
 });