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

fix for clang

Browse Source
This commit is contained in:
vanhauser-thc
2023-04-05 10:32:37 +02:00
parent 1fc0731604
commit e313180e4d
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/afl-mutations.h
View File

@ -1231,7 +1231,7 @@ inline u32 afl_mutate(afl_state_t *afl, u8 *buf, u32 len, u32 steps,
for (u32 step = 0; step < steps; ++step) { for (u32 step = 0; step < steps; ++step) {
retry_havoc_step: retry_havoc_step : {
u32 r = rand_below(afl, MUT_STRATEGY_ARRAY_SIZE), item; u32 r = rand_below(afl, MUT_STRATEGY_ARRAY_SIZE), item;
@ -1667,10 +1667,10 @@ inline u32 afl_mutate(afl_state_t *afl, u8 *buf, u32 len, u32 steps,
if (unlikely(len < 4)) { break; } // no retry if (unlikely(len < 4)) { break; } // no retry
u32 len = choose_block_len(afl, len - 1); u32 blen = choose_block_len(afl, len - 1);
u32 off = rand_below(afl, len - len + 1); u32 off = rand_below(afl, len - blen + 1);
for (u32 i = len - 1; i > 0; i--) { for (u32 i = blen - 1; i > 0; i--) {
u32 j; u32 j;
do { do {
@ -2030,6 +2030,8 @@ inline u32 afl_mutate(afl_state_t *afl, u8 *buf, u32 len, u32 steps,
} }
}
return len; return len;
} }

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

@ -2139,8 +2139,8 @@ havoc_stage:
LIST_FOREACH(&afl->custom_mutator_list, struct custom_mutator, { LIST_FOREACH(&afl->custom_mutator_list, struct custom_mutator, {
if (el->stacked_custom && if (unlikely(el->stacked_custom &&
rand_below(afl, 100) < el->stacked_custom_prob) { rand_below(afl, 100) < el->stacked_custom_prob)) {
u8 *custom_havoc_buf = NULL; u8 *custom_havoc_buf = NULL;
size_t new_len = el->afl_custom_havoc_mutation( size_t new_len = el->afl_custom_havoc_mutation(
@ -2170,7 +2170,8 @@ havoc_stage:
} }
retry_havoc_step: retry_havoc_step : {
u32 r = rand_below(afl, MUT_STRATEGY_ARRAY_SIZE), item; u32 r = rand_below(afl, MUT_STRATEGY_ARRAY_SIZE), item;
switch (mutation_array[r]) { switch (mutation_array[r]) {
@ -3250,6 +3251,8 @@ havoc_stage:
} }
}
if (common_fuzz_stuff(afl, out_buf, temp_len)) { goto abandon_entry; } if (common_fuzz_stuff(afl, out_buf, temp_len)) { goto abandon_entry; }
/* out_buf might have been mangled a bit, so let's restore it to its /* out_buf might have been mangled a bit, so let's restore it to its