ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-16 11:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix skipping unfavored fuzzed entries

Browse Source
This commit is contained in:
vanhauser-thc
2022-01-13 16:38:18 +01:00
parent 8f7e584b82
commit 27ab84fbf1
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/afl-fuzz-one.c
View File

@ -413,8 +413,7 @@ u8 fuzz_one_original(afl_state_t *afl) {
possibly skip to them at the expense of already-fuzzed or non-favored possibly skip to them at the expense of already-fuzzed or non-favored
cases. */ cases. */
if (((afl->queue_cur->was_fuzzed > 0 || afl->queue_cur->fuzz_level > 0) || if ((afl->queue_cur->fuzz_level || !afl->queue_cur->favored) &&
!afl->queue_cur->favored) &&
likely(rand_below(afl, 100) < SKIP_TO_NEW_PROB)) { likely(rand_below(afl, 100) < SKIP_TO_NEW_PROB)) {
return 1; return 1;
@ -429,8 +428,7 @@ u8 fuzz_one_original(afl_state_t *afl) {
The odds of skipping stuff are higher for already-fuzzed inputs and The odds of skipping stuff are higher for already-fuzzed inputs and
lower for never-fuzzed entries. */ lower for never-fuzzed entries. */
if (afl->queue_cycle > 1 && if (afl->queue_cycle > 1 && !afl->queue_cur->fuzz_level) {
(afl->queue_cur->fuzz_level == 0 || afl->queue_cur->was_fuzzed)) {
if (likely(rand_below(afl, 100) < SKIP_NFAV_NEW_PROB)) { return 1; } if (likely(rand_below(afl, 100) < SKIP_NFAV_NEW_PROB)) { return 1; }
@ -2961,17 +2959,12 @@ abandon_entry:
cycle and have not seen this entry before. */ cycle and have not seen this entry before. */
if (!afl->stop_soon && !afl->queue_cur->cal_failed && if (!afl->stop_soon && !afl->queue_cur->cal_failed &&
(afl->queue_cur->was_fuzzed == 0 || afl->queue_cur->fuzz_level == 0) && !afl->queue_cur->was_fuzzed && !afl->queue_cur->disabled) {
!afl->queue_cur->disabled) {
if (!afl->queue_cur->was_fuzzed) { --afl->pending_not_fuzzed;
afl->queue_cur->was_fuzzed = 1;
--afl->pending_not_fuzzed; afl->reinit_table = 1;
afl->queue_cur->was_fuzzed = 1; if (afl->queue_cur->favored) { --afl->pending_favored; }
afl->reinit_table = 1;
if (afl->queue_cur->favored) { --afl->pending_favored; }
}
} }
@ -3024,8 +3017,7 @@ static u8 mopt_common_fuzzing(afl_state_t *afl, MOpt_globals_t MOpt_globals) {
possibly skip to them at the expense of already-fuzzed or non-favored possibly skip to them at the expense of already-fuzzed or non-favored
cases. */ cases. */
if (((afl->queue_cur->was_fuzzed > 0 || afl->queue_cur->fuzz_level > 0) || if ((afl->queue_cur->fuzz_level || !afl->queue_cur->favored) &&
!afl->queue_cur->favored) &&
rand_below(afl, 100) < SKIP_TO_NEW_PROB) { rand_below(afl, 100) < SKIP_TO_NEW_PROB) {
return 1; return 1;
@ -3040,8 +3032,7 @@ static u8 mopt_common_fuzzing(afl_state_t *afl, MOpt_globals_t MOpt_globals) {
The odds of skipping stuff are higher for already-fuzzed inputs and The odds of skipping stuff are higher for already-fuzzed inputs and
lower for never-fuzzed entries. */ lower for never-fuzzed entries. */
if (afl->queue_cycle > 1 && if (afl->queue_cycle > 1 && !afl->queue_cur->fuzz_level) {
(afl->queue_cur->fuzz_level == 0 || afl->queue_cur->was_fuzzed)) {
if (likely(rand_below(afl, 100) < SKIP_NFAV_NEW_PROB)) { return 1; } if (likely(rand_below(afl, 100) < SKIP_NFAV_NEW_PROB)) { return 1; }