Merge pull request #340 from AFLplusplus/dev

dev -> master
This commit is contained in:
van Hauser 2020-04-27 12:12:43 +02:00 committed by GitHub
commit a5d4c8d532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

View File

@ -13,6 +13,8 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
- afl-fuzz: - afl-fuzz:
- AFL_MAP_SIZE was not working correctly - AFL_MAP_SIZE was not working correctly
- better python detection - better python detection
- an old, old bug in afl that would show negative stability in rare
circumstances is now hopefully fixed
- llvm_mode: - llvm_mode:
- if LLVM 11 is installed the posix shm_open+mmap is used and a fixed - 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 address for the shared memory map is used as this increases the

View File

@ -12,6 +12,7 @@
#include <string> #include <string>
#include <fstream> #include <fstream>
#include <llvm/Support/raw_ostream.h>
#include "afl-llvm-common.h" #include "afl-llvm-common.h"
using namespace llvm; using namespace llvm;

View File

@ -193,6 +193,8 @@ u8 calibrate_case(afl_state_t *afl, struct queue_entry *q, u8 *use_mem,
if (q->exec_cksum) { if (q->exec_cksum) {
memcpy(afl->first_trace, afl->fsrv.trace_bits, afl->fsrv.map_size); 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); cksum = hash32(afl->fsrv.trace_bits, afl->fsrv.map_size, HASH_CONST);
if (q->exec_cksum != cksum) {
u8 hnb = has_new_bits(afl, afl->virgin_bits); u8 hnb = has_new_bits(afl, afl->virgin_bits);
if (hnb > new_bits) { new_bits = hnb; } if (hnb > new_bits) { new_bits = hnb; }
if (q->exec_cksum != cksum) {
if (q->exec_cksum) { if (q->exec_cksum) {
u32 i; u32 i;