diff options
| author | vanhauser-thc <vh@thc.org> | 2021-07-19 10:48:41 +0200 |
|---|---|---|
| committer | vanhauser-thc <vh@thc.org> | 2021-07-19 10:48:41 +0200 |
| commit | cc57cc5f463e9b79980c2087d19b4a1e1360ec52 (patch) | |
| tree | 69a89651deefc660b481e9c964f4cb97ab9073b6 /src/afl-fuzz-state.c | |
| parent | 3d1cc8ec57f0bf07d7834b652ec2db24e7914624 (diff) | |
| parent | c55f7af65700e3d11c368072d39ba6670efa477b (diff) | |
| download | afl++-cc57cc5f463e9b79980c2087d19b4a1e1360ec52.tar.gz | |
fix merge conflicts
Diffstat (limited to 'src/afl-fuzz-state.c')
| -rw-r--r-- | src/afl-fuzz-state.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/afl-fuzz-state.c b/src/afl-fuzz-state.c index 0658070e..b832c11e 100644 --- a/src/afl-fuzz-state.c +++ b/src/afl-fuzz-state.c @@ -96,8 +96,6 @@ void afl_state_init(afl_state_t *afl, uint32_t map_size) { afl->splicing_with = -1; /* Splicing with which test case? */ afl->cpu_to_bind = -1; afl->havoc_stack_pow2 = HAVOC_STACK_POW2; - afl->cal_cycles = CAL_CYCLES; - afl->cal_cycles_long = CAL_CYCLES_LONG; afl->hang_tmout = EXEC_TIMEOUT; afl->exit_on_time = 0; afl->stats_update_freq = 1; @@ -341,6 +339,13 @@ void read_afl_environment(afl_state_t *afl, char **envp) { afl->afl_env.afl_cal_fast = get_afl_env(afl_environment_variables[i]) ? 1 : 0; + } else if (!strncmp(env, "AFL_FAST_CAL", + + afl_environment_variable_len)) { + + afl->afl_env.afl_cal_fast = + get_afl_env(afl_environment_variables[i]) ? 1 : 0; + } else if (!strncmp(env, "AFL_STATSD", afl_environment_variable_len)) { |