From 416b20cdf5ae3cffa8d7fca03f299bff83d33a09 Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Fri, 18 Dec 2020 12:15:20 +0100
Subject: [PATCH] fix

---
 afl/src/engines/mod.rs         | 1 -
 fuzzers/libfuzzer/runtime/rt.c | 2 +-
 fuzzers/libfuzzer/src/lib.rs   | 2 +-
 fuzzers/libfuzzer/test.sh      | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/afl/src/engines/mod.rs b/afl/src/engines/mod.rs
index b3794dbfd8..790262bc0c 100644
--- a/afl/src/engines/mod.rs
+++ b/afl/src/engines/mod.rs
@@ -254,7 +254,6 @@ where
         ET: ExecutorsTuple<I>,
         EM: EventManager<C, E, OT, FT, I, R>,
     {
-        let mut added = 0 as u32;
         for directory in &in_dir {
             self.load_from_directory(corpus, generator, engine, manager, Path::new(directory))?;
         }
diff --git a/fuzzers/libfuzzer/runtime/rt.c b/fuzzers/libfuzzer/runtime/rt.c
index 234986396c..5e36f19922 100644
--- a/fuzzers/libfuzzer/runtime/rt.c
+++ b/fuzzers/libfuzzer/runtime/rt.c
@@ -122,7 +122,7 @@ void __sanitizer_cov_trace_switch(uint64_t val, uint64_t *cases) {
 __attribute__((weak)) int LLVMFuzzerInitialize(int *argc, char ***argv);
 void afl_libfuzzer_main();
 
-int afl_libfuzzer_init(int *argc, char ***argv) {
+int afl_libfuzzer_init(int argc, char **argv) {
 
   if (LLVMFuzzerInitialize)
     return LLVMFuzzerInitialize(&argc, &argv);
diff --git a/fuzzers/libfuzzer/src/lib.rs b/fuzzers/libfuzzer/src/lib.rs
index 4b056464ab..ddd01fc4c4 100644
--- a/fuzzers/libfuzzer/src/lib.rs
+++ b/fuzzers/libfuzzer/src/lib.rs
@@ -101,7 +101,7 @@ pub extern "C" fn afl_libfuzzer_main() {
     }
 
     if input != None {
-        for indir in input.unwrap() {
+        for indir in input.clone().unwrap() {
             println!("in: {}", indir);
         }
     }
diff --git a/fuzzers/libfuzzer/test.sh b/fuzzers/libfuzzer/test.sh
index 335a282190..216e32c98f 100755
--- a/fuzzers/libfuzzer/test.sh
+++ b/fuzzers/libfuzzer/test.sh
@@ -7,6 +7,6 @@ rm -f test_fuzz.elf test_fuzz.o
 ./compiler -flto=thin -c test/test.c -o test_fuzz.o || exit 1
 ./compiler -flto=thin test_fuzz.o -o test_fuzz.elf || exit 1
 
-RUST_BACKTRACE=1 ./test_fuzz.elf -x a -x b  foo bar
+RUST_BACKTRACE=1 ./test_fuzz.elf -x a -x b -T5 foo bar