diff options
| -rw-r--r-- | TODO.md | 6 | ||||
| -rw-r--r-- | src/afl-fuzz-init.c | 2 | ||||
| -rw-r--r-- | src/afl-fuzz-misc.c | 23 |
3 files changed, 21 insertions, 10 deletions
@@ -4,7 +4,6 @@ - get "no global vars" working - ## Further down the road afl-fuzz: @@ -13,6 +12,11 @@ afl-fuzz: - ascii_only mode for mutation output - setting min_len/max_len/start_offset/end_offset limits for mutation output +llvm_mode: + - added context sensitive branch coverage + - add CT cov and ngram cov to LTO and InsTrim + - better whitelist solution for LTO + gcc_plugin: - laf-intel - better instrumentation (seems to be better with gcc-9+) diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c index 4d68ee78..e12b1e07 100644 --- a/src/afl-fuzz-init.c +++ b/src/afl-fuzz-init.c @@ -1054,7 +1054,7 @@ static void handle_existing_out_dir(afl_state_t *afl) { /* Let's see how much work is at stake. */ - if (!afl->in_place_resume && + if (!afl->in_place_resume && last_update > start_time2 && last_update - start_time2 > OUTPUT_GRACE * 60) { SAYF("\n" cLRD "[-] " cRST diff --git a/src/afl-fuzz-misc.c b/src/afl-fuzz-misc.c index c6117bd9..20a7c6d0 100644 --- a/src/afl-fuzz-misc.c +++ b/src/afl-fuzz-misc.c @@ -162,17 +162,24 @@ u8 *DTD(u8 *buf, size_t len, u64 cur_ms, u64 event_ms) { s32 t_d, t_h, t_m, t_s; u8 int_buf[16]; - if (!event_ms) snprintf(buf, len, "none seen yet"); + if (!event_ms) { - delta = cur_ms - event_ms; + snprintf(buf, len, "none seen yet"); - t_d = delta / 1000 / 60 / 60 / 24; - t_h = (delta / 1000 / 60 / 60) % 24; - t_m = (delta / 1000 / 60) % 60; - t_s = (delta / 1000) % 60; + } else { + + delta = cur_ms - event_ms; + + t_d = delta / 1000 / 60 / 60 / 24; + t_h = (delta / 1000 / 60 / 60) % 24; + t_m = (delta / 1000 / 60) % 60; + t_s = (delta / 1000) % 60; - DI(int_buf, sizeof(int_buf), t_d); - snprintf(buf, len, "%s days, %d hrs, %d min, %d sec", int_buf, t_h, t_m, t_s); + DI(int_buf, sizeof(int_buf), t_d); + snprintf(buf, len, "%s days, %d hrs, %d min, %d sec", int_buf, t_h, t_m, + t_s); + + } return buf; |