regression fix

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

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"? */

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);

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;
} }

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");