diff options
| author | van Hauser <vh@thc.org> | 2020-04-13 12:12:27 +0200 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2020-04-13 12:12:27 +0200 |
| commit | dda096da03cae528dee9fd53e64896e93efe8f4a (patch) | |
| tree | 20c1410ca0a50155a2abb7b3343b5cc5225f312b /src/afl-fuzz-one.c | |
| parent | 5daec436f93240a0c411d432456f3f86fe1f3181 (diff) | |
| download | afl++-dda096da03cae528dee9fd53e64896e93efe8f4a.tar.gz | |
allow -L -1 to enable mopt in parallel to classic mutation
Diffstat (limited to 'src/afl-fuzz-one.c')
| -rw-r--r-- | src/afl-fuzz-one.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 80567160..95d622f2 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -4377,7 +4377,7 @@ void pso_updating(afl_state_t *afl) { u8 fuzz_one(afl_state_t *afl) { - int key_val_lv = 0; + int key_val_lv_1 = 0, key_val_lv_2 = 0; #ifdef _AFL_DOCUMENT_MUTATIONS @@ -4397,22 +4397,22 @@ u8 fuzz_one(afl_state_t *afl) { #endif - if (afl->limit_time_sig == 0) { + // if limit_time_sig == -1 then both are run after each other - key_val_lv = fuzz_one_original(afl); + if (afl->limit_time_sig <= 0) { key_val_lv_1 = fuzz_one_original(afl); } - } else { + if (afl->limit_time_sig != 0) { if (afl->key_module == 0) - key_val_lv = pilot_fuzzing(afl); + key_val_lv_2 = pilot_fuzzing(afl); else if (afl->key_module == 1) - key_val_lv = core_fuzzing(afl); + key_val_lv_2 = core_fuzzing(afl); else if (afl->key_module == 2) pso_updating(afl); } - return key_val_lv; + return (key_val_lv_1 | key_val_lv_2); #undef BUF_PARAMS |