Fix honggfuzz bug

srlabs · Oct 5, 2023 · 57a1292 · 57a1292
1 parent 0856ad1
commit 57a1292
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ anyhow = { version = "1.0.75", optional = true }
 afl = { version = "0.14.1", default-features = false, optional = true }
 # We use our own fork of honggfuzz to use the tool's latest release
 # https://github.com/rust-fuzz/honggfuzz-rs/pull/85
-honggfuzz = { package = "ziggy-honggfuzz", version = "0.5.55", optional = true }
+honggfuzz = { package = "ziggy-honggfuzz-2", version = "0.5.55", optional = true }
 serde_json = { version = "1.0.105", optional = true }
 log = { version = "0.4.20", optional = true }
 env_logger = { version = "0.10.0", optional = true }

diff --git a/src/bin/cargo-ziggy/fuzz.rs b/src/bin/cargo-ziggy/fuzz.rs
@@ -388,9 +388,12 @@ impl Fuzz {
                 .output()
                 .context("could not run `cargo hfuzz run --help`")?;
 
-            if !std::str::from_utf8(hfuzz_help.stderr.as_slice())
+            if !std::str::from_utf8(hfuzz_help.stdout.as_slice())
                 .unwrap_or_default()
                 .contains("dynamic_input")
+                && !std::str::from_utf8(hfuzz_help.stderr.as_slice())
+                    .unwrap_or_default()
+                    .contains("dynamic_input")
             {
                 panic!("Outdated version of honggfuzz, please update the ziggy version in your Cargo.toml or rebuild the project");
             }