Merge pull request dtolnay#376 from dtolnay/honggfuzz

Add honggfuzz support to fuzz target

Author: dtolnay

.github/workflows/ci.yml

@@ -99,7 +99,10 @@ jobs:
       - run: cargo fuzz check
       - run: cargo check --no-default-features --features afl
         working-directory: fuzz
-
+      - uses: dtolnay/install@honggfuzz
+      - run: sudo apt-get install binutils-dev libunwind-dev
+      - run: cargo hfuzz build --no-default-features --features honggfuzz
+        working-directory: fuzz
 
   clippy:
     name: Clippy

fuzz/.gitignore

@@ -1,6 +1,8 @@
 artifacts/
 corpus/
 coverage/
+hfuzz_target/
+hfuzz_workspace/
 in/
 out/
 target/

fuzz/Cargo.toml

@@ -10,12 +10,14 @@ cargo-fuzz = true
 
 [dependencies]
 afl = { version = "0.12", optional = true }
+honggfuzz = { version = "0.5", optional = true }
 libfuzzer-sys = { version = "0.4", optional = true }
 proc-macro2 = { path = "..", default-features = false }
 
 [features]
 default = ["libfuzzer"]
 afl = ["dep:afl"]
+honggfuzz = ["dep:honggfuzz"]
 libfuzzer = ["dep:libfuzzer-sys"]
 span-locations = ["proc-macro2/span-locations"]
 

fuzz/fuzz_targets/parse_token_stream.rs

@@ -8,18 +8,37 @@
 //     cargo install afl
 //     cargo afl build --no-default-features --features afl --release
 //     cargo afl fuzz -i in -o out target/release/parse_token_stream
+//
+// honggfuzz:
+//
+//     cargo install honggfuzz
+//     cargo hfuzz build --no-default-features --features honggfuzz
+//     HFUZZ_RUN_ARGS="--threads $(nproc) --max_file_size 200 --timeout 1" cargo hfuzz run parse_token_stream
 
 #![cfg_attr(feature = "libfuzzer", no_main)]
 
 use std::str;
 
 #[cfg(not(any(
-    all(feature = "libfuzzer", not(feature = "afl")),
-    all(not(feature = "libfuzzer"), feature = "afl"),
+    all(
+        feature = "libfuzzer",
+        not(feature = "afl"),
+        not(feature = "honggfuzz")
+    ),
+    all(
+        not(feature = "libfuzzer"),
+        feature = "afl",
+        not(feature = "honggfuzz")
+    ),
+    all(
+        not(feature = "libfuzzer"),
+        not(feature = "afl"),
+        feature = "honggfuzz"
+    ),
 )))]
 fn main() {
     compile_error! {
-        r#"exactly one of feature="libfuzzer" and feature="afl" must be enabled"#
+        r#"exactly one of feature="libfuzzer" or feature="afl" or feature="honggfuzz" must be enabled"#
     }
 }
 
@@ -32,6 +51,13 @@ fn main() {
     afl::fuzz(hook, do_fuzz);
 }
 
+#[cfg(feature = "honggfuzz")]
+fn main() {
+    loop {
+        honggfuzz::fuzz(do_fuzz);
+    }
+}
+
 fn do_fuzz(bytes: &[u8]) {
     if bytes.len() < 200 {
         if let Ok(string) = str::from_utf8(bytes) {