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

merge PR#306 from neoni (thanks), silence test when bash is not found

Browse Source
This commit is contained in:
hexcoder-
2020-04-09 18:11:39 +00:00
parent df5c264754
commit fbf5e08425
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/afl-fuzz-init.c
View File

@ -134,8 +134,17 @@ void bind_to_free_cpu(afl_state_t *afl) {
for (i = 0; i < proccount; i++) { for (i = 0; i < proccount; i++) {
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
if (procs[i].ki_oncpu < sizeof(cpu_used) && procs[i].ki_pctcpu > 60) if (!strcmp(procs[i].ki_comm, "idle"))
cpu_used[procs[i].ki_oncpu] = 1; continue;
// fix when ki_oncpu = -1
int oncpu;
oncpu = procs[i].ki_oncpu;
if (oncpu == -1)
oncpu = procs[i].ki_lastcpu;
if (oncpu != -1 && oncpu < sizeof(cpu_used) && procs[i].ki_pctcpu > 60)
cpu_used[oncpu] = 1;
#elif defined(__DragonFly__) #elif defined(__DragonFly__)
if (procs[i].kp_lwp.kl_cpuid < sizeof(cpu_used) && if (procs[i].kp_lwp.kl_cpuid < sizeof(cpu_used) &&
procs[i].kp_lwp.kl_pctcpu > 10) procs[i].kp_lwp.kl_pctcpu > 10)

2
test/test.sh
View File

@ -185,7 +185,7 @@ test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc
esac esac
rm -f in2/in* rm -f in2/in*
export AFL_QUIET=1 export AFL_QUIET=1
if type bash >/dev/null ; then { if command -v bash >/dev/null ; then {
AFL_PATH=`pwd`/.. ../afl-cmin.bash -m ${MEM_LIMIT} -i in -o in2 -- ./test-instr.plain >/dev/null AFL_PATH=`pwd`/.. ../afl-cmin.bash -m ${MEM_LIMIT} -i in -o in2 -- ./test-instr.plain >/dev/null
CNT=`ls in2/* 2>/dev/null | wc -l` CNT=`ls in2/* 2>/dev/null | wc -l`
case "$CNT" in case "$CNT" in