From 1fa285079f895b3e0b5b347830ce8a7ab980c691 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Thu, 30 Nov 2023 11:52:10 +0100
Subject: nit

---
 utils/aflpp_driver/aflpp_driver.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'utils/aflpp_driver/aflpp_driver.c')

diff --git a/utils/aflpp_driver/aflpp_driver.c b/utils/aflpp_driver/aflpp_driver.c
index 4e8f466d..1104a81e 100644
--- a/utils/aflpp_driver/aflpp_driver.c
+++ b/utils/aflpp_driver/aflpp_driver.c
@@ -279,7 +279,9 @@ __attribute__((weak)) int main(int argc, char **argv) {
 
   */
 
-  if (argc < 2 || strncmp(argv[1], "-h", 2) == 0)
+  if (argc < 2 || strncmp(argv[1], "-h", 2) == 0 ||
+      strcmp(argv[1], "--help") == 0) {
+
     printf(
         "============================== INFO ================================\n"
         "This binary is built for afl++.\n"
@@ -296,6 +298,13 @@ __attribute__((weak)) int main(int argc, char **argv) {
         "option\n"
         "===================================================================\n",
         argv[0], argv[0]);
+    if (strncmp(argv[1], "-h", 2) == 0 || strcmp(argv[1], "--help") == 0) {
+
+      exit(0);
+
+    }
+
+  }
 
   return LLVMFuzzerRunDriver(&argc, &argv, LLVMFuzzerTestOneInput);
 
-- 
cgit 1.4.1


From d02036adfd098766ce9576905613cb7911e315d5 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Fri, 1 Dec 2023 07:20:00 +0100
Subject: fix

---
 instrumentation/afl-compiler-rt.o.c | 2 +-
 utils/aflpp_driver/aflpp_driver.c   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'utils/aflpp_driver/aflpp_driver.c')

diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c
index 106892e2..def59b6b 100644
--- a/instrumentation/afl-compiler-rt.o.c
+++ b/instrumentation/afl-compiler-rt.o.c
@@ -183,7 +183,7 @@ static u8 _is_sancov;
 
 /* Debug? */
 
-static u32 __afl_debug;
+/*static*/ u32 __afl_debug;
 
 /* Already initialized markers */
 
diff --git a/utils/aflpp_driver/aflpp_driver.c b/utils/aflpp_driver/aflpp_driver.c
index 1104a81e..3f8e1ef7 100644
--- a/utils/aflpp_driver/aflpp_driver.c
+++ b/utils/aflpp_driver/aflpp_driver.c
@@ -298,7 +298,8 @@ __attribute__((weak)) int main(int argc, char **argv) {
         "option\n"
         "===================================================================\n",
         argv[0], argv[0]);
-    if (strncmp(argv[1], "-h", 2) == 0 || strcmp(argv[1], "--help") == 0) {
+    if (argc == 2 && strncmp(argv[1], "-h", 2) == 0 ||
+        strcmp(argv[1], "--help") == 0) {
 
       exit(0);
 
-- 
cgit 1.4.1


From 858e0bfd05894d07630d8a56bb25d56a8206b2b7 Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Fri, 1 Dec 2023 07:21:43 +0100
Subject: fix

---
 utils/aflpp_driver/aflpp_driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'utils/aflpp_driver/aflpp_driver.c')

diff --git a/utils/aflpp_driver/aflpp_driver.c b/utils/aflpp_driver/aflpp_driver.c
index 3f8e1ef7..dab7fd95 100644
--- a/utils/aflpp_driver/aflpp_driver.c
+++ b/utils/aflpp_driver/aflpp_driver.c
@@ -298,8 +298,8 @@ __attribute__((weak)) int main(int argc, char **argv) {
         "option\n"
         "===================================================================\n",
         argv[0], argv[0]);
-    if (argc == 2 && strncmp(argv[1], "-h", 2) == 0 ||
-        strcmp(argv[1], "--help") == 0) {
+    if (argc == 2 &&
+        (strncmp(argv[1], "-h", 2) == 0 || strcmp(argv[1], "--help") == 0)) {
 
       exit(0);
 
-- 
cgit 1.4.1


From ae9cdb34e4fdc10c7c2d1c775238a7501fda288a Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Thu, 14 Dec 2023 16:04:00 +0100
Subject: AFL_FUZZER_LOOPCOUNT

---
 docs/Changelog.md                 | 1 +
 utils/aflpp_driver/aflpp_driver.c | 7 +++++++
 2 files changed, 8 insertions(+)

(limited to 'utils/aflpp_driver/aflpp_driver.c')

diff --git a/docs/Changelog.md b/docs/Changelog.md
index b2e9fbf6..7faa0ab3 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -25,6 +25,7 @@
     - fix for a few string compare transform functions for LAF
   - frida_mode:
     - fixes support for large map offsets
+  - support for AFL_FUZZER_LOOPCOUNT for afl.rs and LLVMFuzzerTestOneInput
   - afl-cmin/afl-cmin.bash: prevent unneeded file errors
   - added new tool afl-addseeds that adds new seeds to a running campaign
   - added benchmark/benchmark.py if you want to see how good your fuzzing
diff --git a/utils/aflpp_driver/aflpp_driver.c b/utils/aflpp_driver/aflpp_driver.c
index dab7fd95..9ffb2383 100644
--- a/utils/aflpp_driver/aflpp_driver.c
+++ b/utils/aflpp_driver/aflpp_driver.c
@@ -292,6 +292,7 @@ __attribute__((weak)) int main(int argc, char **argv) {
         "afl-fuzz will run N iterations before re-spawning the process "
         "(default: "
         "INT_MAX)\n"
+        "You can also use AFL_FUZZER_LOOPCOUNT to set N\n"
         "For stdin input processing, pass '-' as single command line option.\n"
         "For file input processing, pass '@@' as single command line option.\n"
         "To use with afl-cmin or afl-cmin.bash pass '-' as single command line "
@@ -379,6 +380,12 @@ __attribute__((weak)) int LLVMFuzzerRunDriver(
 
   }
 
+  if (getenv("AFL_FUZZER_LOOPCOUNT")) {
+
+    N = atoi(getenv("AFL_FUZZER_LOOPCOUNT"));
+
+  }
+
   assert(N > 0);
 
   __afl_manual_init();
-- 
cgit 1.4.1