diff options
| author | van Hauser <vh@thc.org> | 2020-12-23 14:58:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 14:58:52 +0100 |
| commit | 7dc433a0c0efb236a2ab6fa4006a91aa02e26779 (patch) | |
| tree | b0a48cd22af9aaa9695b61d08499232dbe9f0f36 /src/afl-fuzz-run.c | |
| parent | 1078409875cacc5626a3961e08cf67c68049d22a (diff) | |
| parent | 8d10d12ab344bdf6dfe0478e927c92278b4aac78 (diff) | |
| download | afl++-7dc433a0c0efb236a2ab6fa4006a91aa02e26779.tar.gz | |
Merge pull request #637 from AFLplusplus/dev
minor push to stable
Diffstat (limited to 'src/afl-fuzz-run.c')
| -rw-r--r-- | src/afl-fuzz-run.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/afl-fuzz-run.c b/src/afl-fuzz-run.c index a97ceb89..32cca579 100644 --- a/src/afl-fuzz-run.c +++ b/src/afl-fuzz-run.c @@ -28,6 +28,9 @@ #include <sys/time.h> #include <signal.h> #include <limits.h> +#if !defined NAME_MAX +#define NAME_MAX _XOPEN_NAME_MAX +#endif #include "cmplog.h" @@ -62,8 +65,6 @@ fuzz_run_target(afl_state_t *afl, afl_forkserver_t *fsrv, u32 timeout) { time_spent_start = (spec.tv_sec * 1000000000) + spec.tv_nsec; #endif - // TODO: Don't classify for faults? - classify_counts(fsrv); return res; } @@ -379,6 +380,7 @@ u8 calibrate_case(afl_state_t *afl, struct queue_entry *q, u8 *use_mem, } + classify_counts(&afl->fsrv); cksum = hash64(afl->fsrv.trace_bits, afl->fsrv.map_size, HASH_CONST); if (q->exec_cksum != cksum) { @@ -767,13 +769,14 @@ u8 trim_case(afl_state_t *afl, struct queue_entry *q, u8 *in_buf) { write_with_gap(afl, in_buf, q->len, remove_pos, trim_avail); fault = fuzz_run_target(afl, &afl->fsrv, afl->fsrv.exec_tmout); - ++afl->trim_execs; if (afl->stop_soon || fault == FSRV_RUN_ERROR) { goto abort_trimming; } /* Note that we don't keep track of crashes or hangs here; maybe TODO? */ + ++afl->trim_execs; + classify_counts(&afl->fsrv); cksum = hash64(afl->fsrv.trace_bits, afl->fsrv.map_size, HASH_CONST); /* If the deletion had no impact on the trace, make it permanent. This |