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

regression fix

Browse Source
This commit is contained in:
vanhauser-thc
2023-02-23 11:22:40 +01:00
parent c33f8751e3
commit 0c0a6c3bfa
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/config.h
View File

@ -489,7 +489,7 @@
/* Minimum length of a queue input to be evaluated for "is_ascii"? */ /* Minimum length of a queue input to be evaluated for "is_ascii"? */
#define AFL_TXT_MIN_LEN 16 #define AFL_TXT_MIN_LEN 12
/* Maximum length of a queue input to be evaluated for "is_ascii"? */ /* Maximum length of a queue input to be evaluated for "is_ascii"? */

2
src/afl-forkserver.c
View File

@ -59,7 +59,7 @@ static list_t fsrv_list = {.element_prealloc_count = 0};
static void fsrv_exec_child(afl_forkserver_t *fsrv, char **argv) { static void fsrv_exec_child(afl_forkserver_t *fsrv, char **argv) {
if (fsrv->qemu_mode || fsrv->cs_mode) { if (fsrv->qemu_mode || fsrv->frida_mode || fsrv->cs_mode) {
setenv("AFL_DISABLE_LLVM_INSTRUMENTATION", "1", 0); setenv("AFL_DISABLE_LLVM_INSTRUMENTATION", "1", 0);

8
src/afl-fuzz-cmplog.c
View File

@ -33,11 +33,15 @@ void cmplog_exec_child(afl_forkserver_t *fsrv, char **argv) {
setenv("___AFL_EINS_ZWEI_POLIZEI___", "1", 1); setenv("___AFL_EINS_ZWEI_POLIZEI___", "1", 1);
if (fsrv->qemu_mode) { setenv("AFL_DISABLE_LLVM_INSTRUMENTATION", "1", 0); } if (fsrv->qemu_mode || fsrv->frida_mode || fsrv->cs_mode) {
setenv("AFL_DISABLE_LLVM_INSTRUMENTATION", "1", 0);
}
if (!fsrv->qemu_mode && !fsrv->frida_mode && argv[0] != fsrv->cmplog_binary) { if (!fsrv->qemu_mode && !fsrv->frida_mode && argv[0] != fsrv->cmplog_binary) {
argv[0] = fsrv->cmplog_binary; fsrv->target_path = argv[0] = fsrv->cmplog_binary;
} }

3
src/afl-fuzz.c
View File

@ -1298,7 +1298,8 @@ int main(int argc, char **argv_orig, char **envp) {
} }
if (afl->is_main_node == 1 && afl->schedule != FAST && afl->schedule != EXPLORE) { if (afl->is_main_node == 1 && afl->schedule != FAST &&
afl->schedule != EXPLORE) {
FATAL("-M is compatible only with fast and explore -p power schedules"); FATAL("-M is compatible only with fast and explore -p power schedules");

4
src/afl-gotcpu.c
View File

@ -92,7 +92,7 @@ static u32 measure_preemption(u32 target_ms) {
volatile u32 v1, v2 = 0; volatile u32 v1, v2 = 0;
u64 st_t, en_t, st_c, en_c, real_delta, slice_delta; u64 st_t, en_t, st_c, en_c, real_delta, slice_delta;
//s32 loop_repeats = 0; // s32 loop_repeats = 0;
st_t = get_cur_time_us(); st_t = get_cur_time_us();
st_c = get_cpu_usage_us(); st_c = get_cpu_usage_us();
@ -113,7 +113,7 @@ repeat_loop:
if (en_t - st_t < target_ms * 1000) { if (en_t - st_t < target_ms * 1000) {
//loop_repeats++; // loop_repeats++;
goto repeat_loop; goto repeat_loop;
} }