This commit is contained in:
vanhauser-thc 2024-02-09 13:09:16 +01:00
parent 3cbaefd247
commit f2b7357ff3
3 changed files with 21 additions and 12 deletions

View File

@ -1673,13 +1673,13 @@ void ModuleSanitizerCoverageLTO::instrumentFunction(
inst = inst_save; inst = inst_save;
}
/* if (debug) /* if (debug)
fprintf(stderr, "Next instrumentation (%u-%u=%u %u-%u=%u)\n", inst, fprintf(stderr, "Next instrumentation (%u-%u=%u %u-%u=%u)\n", inst,
inst_save, inst - inst_save, afl_global_id, save_global, inst_save, inst - inst_save, afl_global_id, save_global,
afl_global_id - save_global);*/ afl_global_id - save_global);*/
}
for (auto &BB : F) { for (auto &BB : F) {
skip_next = 0; skip_next = 0;
@ -1932,8 +1932,9 @@ void ModuleSanitizerCoverageLTO::instrumentFunction(
} }
// if (shouldInstrumentBlock(F, &BB, DT, PDT, Options)) if (!instrument_ctx)
// BlocksToInstrument.push_back(&BB); if (shouldInstrumentBlock(F, &BB, DT, PDT, Options))
BlocksToInstrument.push_back(&BB);
/* /*
for (auto &Inst : BB) { for (auto &Inst : BB) {

View File

@ -1197,10 +1197,18 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
} else { } else {
if (!fsrv->qemu_mode && !fsrv->cs_mode
#ifdef __linux__
&& !fsrv->nyx_mode
#endif
) {
WARNF( WARNF(
"Old fork server model is used by the target, this still works " "Old fork server model is used by the target, this still works "
"though."); "though.");
}
if (!be_quiet) { OKF("All right - old fork server is up."); } if (!be_quiet) { OKF("All right - old fork server is up."); }
if (getenv("AFL_DEBUG")) { if (getenv("AFL_DEBUG")) {

View File

@ -201,7 +201,7 @@ echo "[*] Installing Unicorn python bindings..."
cd unicorn/bindings/python || exit 1 cd unicorn/bindings/python || exit 1
if [ -z "$VIRTUAL_ENV" ]; then if [ -z "$VIRTUAL_ENV" ]; then
echo "[*] Info: Installing python unicornafl using --user" echo "[*] Info: Installing python unicornafl using --user"
THREADS=$CORES $PYTHONBIN -m pip install --user --force .|| exit 1 THREADS=$CORES $PYTHONBIN -m pip install --user --break-system-packages --force .|| exit 1
else else
echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV" echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV"
THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1 THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1
@ -211,7 +211,7 @@ echo "[*] Installing Unicornafl python bindings..."
cd bindings/python || exit 1 cd bindings/python || exit 1
if [ -z "$VIRTUAL_ENV" ]; then if [ -z "$VIRTUAL_ENV" ]; then
echo "[*] Info: Installing python unicornafl using --user" echo "[*] Info: Installing python unicornafl using --user"
THREADS=$CORES $PYTHONBIN -m pip install --user --force .|| exit 1 THREADS=$CORES $PYTHONBIN -m pip install --user --break-system-packages --force .|| exit 1
else else
echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV" echo "[*] Info: Installing python unicornafl to virtualenv: $VIRTUAL_ENV"
THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1 THREADS=$CORES $PYTHONBIN -m pip install --force .|| exit 1