diff options
author | van Hauser <vh@thc.org> | 2023-10-03 10:36:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-03 10:36:21 +0200 |
commit | d09950f4bb98431576b872436f0fbf773ab895db (patch) | |
tree | 227f6d6086215f5091743d69d778f0e3c27b7a94 /src/afl-fuzz.c | |
parent | 1c582b6aeec034b2c0ef650abd35352df7d78fa7 (diff) | |
parent | 63100d2012038ce67bdf20b624c8c53afd4b99c7 (diff) | |
download | afl++-d09950f4bb98431576b872436f0fbf773ab895db.tar.gz |
Merge pull request #1880 from AFLplusplus/dev
push to stable
Diffstat (limited to 'src/afl-fuzz.c')
-rw-r--r-- | src/afl-fuzz.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index 86c05223..2538f4a4 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -1346,6 +1346,12 @@ int main(int argc, char **argv_orig, char **envp) { } + if (afl->sync_id && strcmp(afl->sync_id, "addseeds") == 0) { + + FATAL("-M/-S name 'addseeds' is a reserved name, choose something else"); + + } + if (afl->is_main_node == 1 && afl->schedule != FAST && afl->schedule != EXPLORE) { @@ -2826,7 +2832,9 @@ int main(int argc, char **argv_orig, char **envp) { if (likely(afl->switch_fuzz_mode && afl->fuzz_mode == 0 && !afl->non_instrumented_mode) && - unlikely(cur_time > afl->last_find_time + afl->switch_fuzz_mode)) { + unlikely(cur_time > (likely(afl->last_find_time) ? afl->last_find_time + : afl->start_time) + + afl->switch_fuzz_mode)) { if (afl->afl_env.afl_no_ui) { |