aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-02-27 10:52:57 +0100
committerGitHub <noreply@github.com>2020-02-27 10:52:57 +0100
commite4f01a6825983eb7de0d1fca0762f2bb6efdef9a (patch)
tree48b7ac36712d9d6aea63af3be86ac1766aca6a7a
parent7c17697cae6ff4b28f7e039b53d20c70c558ed7f (diff)
parent3549cbb3a27ca46d81f4783e5b1a71dadcfe2883 (diff)
downloadafl++-e4f01a6825983eb7de0d1fca0762f2bb6efdef9a.tar.gz
Merge pull request #213 from Kusoku/master
Fix hanging fork and child with -V -E
-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;
}