about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrea Fioraldi <andreafioraldi@gmail.com>2020-02-27 16:04:20 +0100
committerAndrea Fioraldi <andreafioraldi@gmail.com>2020-02-27 16:04:20 +0100
commit2b9ecd6eec3f6d84461a45fe65bfb83087e576d6 (patch)
tree821934910582eb69f1ebfcb02f354c740e6f608a
parent3712a7011545b6babec9b3f95a947349f13f01f2 (diff)
parente4f01a6825983eb7de0d1fca0762f2bb6efdef9a (diff)
downloadafl++-2b9ecd6eec3f6d84461a45fe65bfb83087e576d6.tar.gz
Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus
-rw-r--r--README.md2
-rw-r--r--src/afl-fuzz.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/README.md b/README.md
index c764d85a..1859eddf 100644
--- a/README.md
+++ b/README.md
@@ -702,7 +702,7 @@ without feedback, bug reports, or patches from:
   Nathan Voss                           Dominik Maier
   Andrea Biondo                         Vincent Le Garrec
   Khaled Yakdan                         Kuang-che Wu
-  Josephine Calliotte
+  Josephine Calliotte                   Konrad Welc
 ```
 
 Thank you!
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index cc895f74..f68f063d 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -1024,6 +1024,7 @@ int main(int argc, char** argv, char** envp) {
       if (most_time * 1000 < cur_ms_lv - start_time) {
 
         most_time_key = 2;
+        stop_soon = 2;
         break;
 
       }
@@ -1035,6 +1036,7 @@ int main(int argc, char** argv, char** envp) {
       if (most_execs <= total_execs) {
 
         most_execs_key = 2;
+        stop_soon = 2;
         break;
 
       }