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 /include | |
| parent | 3d1cc8ec57f0bf07d7834b652ec2db24e7914624 (diff) | |
| parent | c55f7af65700e3d11c368072d39ba6670efa477b (diff) | |
| download | afl++-cc57cc5f463e9b79980c2087d19b4a1e1360ec52.tar.gz | |
fix merge conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/afl-fuzz.h | 7 | ||||
| -rw-r--r-- | include/forkserver.h | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 4aba3bdf..2e2c78ef 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -478,9 +478,7 @@ typedef struct afl_state { u32 hang_tmout; /* Timeout used for hang det (ms) */ - u8 cal_cycles, /* Calibration cycles defaults */ - cal_cycles_long, /* Calibration cycles defaults */ - havoc_stack_pow2, /* HAVOC_STACK_POW2 */ + u8 havoc_stack_pow2, /* HAVOC_STACK_POW2 */ no_unlink, /* do not unlink cur_input */ debug, /* Debug mode */ custom_only, /* Custom mutator only mode */ @@ -521,7 +519,8 @@ typedef struct afl_state { shmem_testcase_mode, /* If sharedmem testcases are used */ expand_havoc, /* perform expensive havoc after no find */ cycle_schedules, /* cycle power schedules? */ - old_seed_selection; /* use vanilla afl seed selection */ + old_seed_selection, /* use vanilla afl seed selection */ + reinit_table; /* reinit the queue weight table */ u8 *virgin_bits, /* Regions yet untouched by fuzzing */ *virgin_tmout, /* Bits we haven't seen in tmouts */ diff --git a/include/forkserver.h b/include/forkserver.h index 2baa6f0a..c6f7de00 100644 --- a/include/forkserver.h +++ b/include/forkserver.h @@ -54,6 +54,7 @@ typedef struct afl_forkserver { u32 exec_tmout; /* Configurable exec timeout (ms) */ u32 init_tmout; /* Configurable init timeout (ms) */ u32 map_size; /* map size used by the target */ + u32 real_map_size; /* real map size, unaligned */ u32 snapshot; /* is snapshot feature used */ u64 mem_limit; /* Memory cap for child (MB) */ |