diff options
author | van Hauser <vh@thc.org> | 2023-09-11 07:38:45 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-11 07:38:45 +0000 |
commit | 0688c779ec543c4f5f84363b06c72ac11a14f716 (patch) | |
tree | d8a48ed4ef6484918f3832c61af60af81f5d5392 /src | |
parent | 11a622c63d70c9ca16c9847418b88992139aa892 (diff) | |
parent | 5f6c76e192bcfde6abcf9d4156bfbb87d5480e23 (diff) | |
download | afl++-0688c779ec543c4f5f84363b06c72ac11a14f716.tar.gz |
Merge pull request #1857 from AFLplusplus/dev
push to stable
Diffstat (limited to 'src')
-rw-r--r-- | src/afl-forkserver.c | 1 | ||||
-rw-r--r-- | src/afl-fuzz-queue.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c index 9da096f7..07f5a1a9 100644 --- a/src/afl-forkserver.c +++ b/src/afl-forkserver.c @@ -272,6 +272,7 @@ void afl_fsrv_init_dup(afl_forkserver_t *fsrv_to, afl_forkserver_t *from) { fsrv_to->uses_crash_exitcode = from->uses_crash_exitcode; fsrv_to->crash_exitcode = from->crash_exitcode; fsrv_to->child_kill_signal = from->child_kill_signal; + fsrv_to->fsrv_kill_signal = from->fsrv_kill_signal; fsrv_to->debug = from->debug; // These are forkserver specific. diff --git a/src/afl-fuzz-queue.c b/src/afl-fuzz-queue.c index 14ba1ace..793bec90 100644 --- a/src/afl-fuzz-queue.c +++ b/src/afl-fuzz-queue.c @@ -737,7 +737,11 @@ void update_bitmap_score(afl_state_t *afl, struct queue_entry *q) { u64 top_rated_fav_factor; u64 top_rated_fuzz_p2; - if (likely(afl->schedule >= FAST && afl->schedule <= RARE)) { + if (likely(afl->schedule >= FAST && afl->schedule < RARE)) { + + top_rated_fuzz_p2 = 0; // Skip the fuzz_p2 comparison + + } else if (unlikely(afl->schedule == RARE)) { top_rated_fuzz_p2 = next_pow2(afl->n_fuzz[afl->top_rated[i]->n_fuzz_entry]); |