diff options
| author | van Hauser <vh@thc.org> | 2021-01-21 12:03:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 12:03:21 +0100 |
| commit | fc3f06caec887b807e13eeb8be4c9899ec04036a (patch) | |
| tree | 1884eab7e5e1db9d4c9a00439fdb1589f15bc410 /src/afl-forkserver.c | |
| parent | b39b87b2f720926645ac5ae23fd49dec7e94c7e9 (diff) | |
| parent | 0d472adef0cbe68cec128b7b15e508f0bb05455d (diff) | |
| download | afl++-fc3f06caec887b807e13eeb8be4c9899ec04036a.tar.gz | |
Merge pull request #689 from AFLplusplus/cmplog_merge
cmplog merge
Diffstat (limited to 'src/afl-forkserver.c')
| -rw-r--r-- | src/afl-forkserver.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c index 39f044f2..50e4139b 100644 --- a/src/afl-forkserver.c +++ b/src/afl-forkserver.c @@ -58,7 +58,7 @@ static list_t fsrv_list = {.element_prealloc_count = 0}; static void fsrv_exec_child(afl_forkserver_t *fsrv, char **argv) { - if (fsrv->qemu_mode) setenv("AFL_DISABLE_LLVM_INSTRUMENTATION", "1", 0); + if (fsrv->qemu_mode) { setenv("AFL_DISABLE_LLVM_INSTRUMENTATION", "1", 0); } execv(fsrv->target_path, argv); @@ -396,6 +396,12 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv, struct rlimit r; + if (!fsrv->cmplog_binary && fsrv->qemu_mode == false) { + + unsetenv(CMPLOG_SHM_ENV_VAR); // we do not want that in non-cmplog fsrv + + } + /* Umpf. On OpenBSD, the default fd limit for root users is set to soft 128. Let's try to fix that... */ if (!getrlimit(RLIMIT_NOFILE, &r) && r.rlim_cur < FORKSRV_FD + 2) { |