diff options
| author | van Hauser <vh@thc.org> | 2020-04-27 12:12:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 12:12:43 +0200 |
| commit | a5d4c8d532263f13e0036b55dfbbbf302ec0766f (patch) | |
| tree | 3f4ef40f36836e1c35b304c5bfefc80d98904713 | |
| parent | 62ec52dd956d62957b431ef804b7956124823f00 (diff) | |
| parent | a46fe3ad430901023684e59f138d1b8ddcb246b8 (diff) | |
| download | afl++-a5d4c8d532263f13e0036b55dfbbbf302ec0766f.tar.gz | |
Merge pull request #340 from AFLplusplus/dev
dev -> master
| -rw-r--r-- | docs/Changelog.md | 2 | ||||
| -rw-r--r-- | llvm_mode/afl-llvm-common.cc | 1 | ||||
| -rw-r--r-- | src/afl-fuzz-run.c | 7 |
3 files changed, 7 insertions, 3 deletions
diff --git a/docs/Changelog.md b/docs/Changelog.md index 71de0984..da28ce53 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -13,6 +13,8 @@ sending a mail to <afl-users+subscribe@googlegroups.com>. - afl-fuzz: - AFL_MAP_SIZE was not working correctly - better python detection + - an old, old bug in afl that would show negative stability in rare + circumstances is now hopefully fixed - llvm_mode: - if LLVM 11 is installed the posix shm_open+mmap is used and a fixed address for the shared memory map is used as this increases the diff --git a/llvm_mode/afl-llvm-common.cc b/llvm_mode/afl-llvm-common.cc index 9b7a444a..04dd9475 100644 --- a/llvm_mode/afl-llvm-common.cc +++ b/llvm_mode/afl-llvm-common.cc @@ -12,6 +12,7 @@ #include <string> #include <fstream> +#include <llvm/Support/raw_ostream.h> #include "afl-llvm-common.h" using namespace llvm; diff --git a/src/afl-fuzz-run.c b/src/afl-fuzz-run.c index bf8c4ec0..692026d4 100644 --- a/src/afl-fuzz-run.c +++ b/src/afl-fuzz-run.c @@ -193,6 +193,8 @@ u8 calibrate_case(afl_state_t *afl, struct queue_entry *q, u8 *use_mem, if (q->exec_cksum) { memcpy(afl->first_trace, afl->fsrv.trace_bits, afl->fsrv.map_size); + u8 hnb = has_new_bits(afl, afl->virgin_bits); + if (hnb > new_bits) { new_bits = hnb; } } @@ -226,12 +228,11 @@ u8 calibrate_case(afl_state_t *afl, struct queue_entry *q, u8 *use_mem, } cksum = hash32(afl->fsrv.trace_bits, afl->fsrv.map_size, HASH_CONST); + u8 hnb = has_new_bits(afl, afl->virgin_bits); + if (hnb > new_bits) { new_bits = hnb; } if (q->exec_cksum != cksum) { - u8 hnb = has_new_bits(afl, afl->virgin_bits); - if (hnb > new_bits) { new_bits = hnb; } - if (q->exec_cksum) { u32 i; |