From 0fdca67f720aab3e7655d610fe011a236dfcf4f5 Mon Sep 17 00:00:00 2001
From: Louis Merlin <louis@srlabs.de>
Date: Wed, 31 Jan 2024 15:25:25 +0100
Subject: [PATCH] Add support for multiple AFL flag arguments

---
 Cargo.lock                  | 2 +-
 src/bin/cargo-ziggy/fuzz.rs | 4 ++--
 src/bin/cargo-ziggy/main.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff76461..bf75751 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -921,7 +921,7 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
 
 [[package]]
 name = "ziggy"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "afl",
  "anyhow",
diff --git a/src/bin/cargo-ziggy/fuzz.rs b/src/bin/cargo-ziggy/fuzz.rs
index 92afa90..d156ed9 100644
--- a/src/bin/cargo-ziggy/fuzz.rs
+++ b/src/bin/cargo-ziggy/fuzz.rs
@@ -365,12 +365,12 @@ impl Fuzz {
                                 mutation_option,
                                 &timeout_option_afl,
                                 &dictionary_option,
-                                &self.afl_flags.clone().unwrap_or_default(),
-                                &format!("./target/afl/debug/{}", self.target),
                             ]
                             .iter()
                             .filter(|a| a != &&""),
                         )
+                        .args(self.afl_flags.clone())
+                        .arg(format!("./target/afl/debug/{}", self.target))
                         .env("AFL_AUTORESUME", "1")
                         .env("AFL_TESTCACHE_SIZE", "100")
                         .env("AFL_FAST_CAL", "1")
diff --git a/src/bin/cargo-ziggy/main.rs b/src/bin/cargo-ziggy/main.rs
index c2e761e..b68f626 100644
--- a/src/bin/cargo-ziggy/main.rs
+++ b/src/bin/cargo-ziggy/main.rs
@@ -151,7 +151,7 @@ pub struct Fuzz {
 
     /// Pass flags to AFL++ directly
     #[clap(short, long)]
-    afl_flags: Option<String>,
+    afl_flags: Vec<String>,
 }
 
 #[derive(Args)]