Revert "[Fuzzer] Afl driver changing iterations handling"

[metzman]

Summary

This reverts rL334510 due to breakage of afl_driver's command line interface.

[metzman]

@kcc @morehouse
Please land this revert as soon as possible since the initial revision breaks afl_driver's command line interface, which is used by ClusterFuzz to reproduce crashes.
AFL on OSS-Fuzz has been broken since the initial revision landed.

Thanks!

lib/fuzzer/afl/afl_driver.cpp

 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include <fstream>
 #include <iostream>
 #include <vector>
 
 // Platform detection. Copied from FuzzerInternal.h
 #ifdef __linux__
 #define LIBFUZZER_LINUX 1
for (int i = 1; i < argc; i++) {
     assert(in);
     LLVMFuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()),
                            bytes.size());
     std::cout << "Execution successful" << std::endl;
   }
   return 0;
 }
 
-static void set_iterations(int *N, const char *arg) {
-  char *next_char;
-  long NL = strtol(arg, &next_char, 10);
-  if (NL < 1 || NL > INT_MAX || *next_char != '\0') {
-    fprintf(stderr, "WARNING: iterations invalid `%s`\n",
-        arg);
-    ::exit(-1);
-  }
-
-  *N = static_cast<int>(NL);
-}
-
 int main(int argc, char **argv) {
   fprintf(stderr,
       "======================= INFO =========================\n"
       "This binary is built for AFL-fuzz.\n"
       "To run the target function on individual input(s) execute this:\n"
       "  %s < INPUT_FILE\n"
       "or\n"
       "  %s INPUT_FILE1 [INPUT_FILE2 ... ]\n"
int main(int argc, char **argv) {
   maybe_duplicate_stderr();
   maybe_initialize_extra_stats();
 
   if (!getenv("AFL_DRIVER_DONT_DEFER"))
     __afl_manual_init();
 
   int N = 1000;
   if (argc == 2 && argv[1][0] == '-')
-    set_iterations(&N, argv[1] + 1);
-  else if(argc == 2) {
+      N = atoi(argv[1] + 1);
+  else if(argc == 2 && (N = atoi(argv[1])) > 0)
       fprintf(stderr, "WARNING: using the deprecated call style `%s %d`\n",
               argv[0], N);
-    set_iterations(&N, argv[1]);
-  } else if (argc > 1)
+  else if (argc > 1)
     return ExecuteFilesOnyByOne(argc, argv);
 
   assert(N > 0);
 
   // Call LLVMFuzzerTestOneInput here so that coverage caused by initialization
   // on the first execution of LLVMFuzzerTestOneInput is ignored.
   uint8_t dummy_input[1] = {0};
   LLVMFuzzerTestOneInput(dummy_input, 1);

test/fuzzer/afl-driver.test

 
 
 RUN: %run %t-AFLDriverTest < %t.file3 666 2>&1 | FileCheck %s --check-prefix=CHECK3
 CHECK3: WARNING: using the deprecated call style
 CHECK3: __afl_persistent_loop calle, Count = 666
 CHECK3: LLVMFuzzerTestOneInput called; Size = 3
 
 
-RUN: not %run %t-AFLDriverTest %t.file3 2>&1 | FileCheck %s --check-prefix=CHECK4
-CHECK4: WARNING: using the deprecated call style `{{.*}} 1000`
-CHECK4: WARNING: iterations invalid `{{.*}}`
+RUN: %run %t-AFLDriverTest %t.file3 2>&1 | FileCheck %s --check-prefix=CHECK4
+CHECK4: LLVMFuzzerTestOneInput called; Size = 3
 
 RUN: %run %t-AFLDriverTest %t.file3 %t.file4  2>&1 | FileCheck %s --check-prefix=CHECK5
 CHECK5: LLVMFuzzerTestOneInput called; Size = 3
 CHECK5: LLVMFuzzerTestOneInput called; Size = 4
-
-RUN: not %run %t-AFLDriverTest < %t.file3 --1 2>&1 | FileCheck %s --check-prefix=CHECK6
-CHECK6: WARNING: iterations invalid `-1`
-
-RUN: not %run %t-AFLDriverTest < %t.file3 -Invalid 2>&1 | FileCheck %s --check-prefix=CHECK7
-CHECK7: WARNING: iterations invalid `Invalid`