diff options
| author | van Hauser <vh@thc.org> | 2022-05-16 12:34:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 12:34:38 +0200 |
| commit | a2eb1f14126cffd046c44d5e87e945ed2699cec5 (patch) | |
| tree | 2eecf55a92eec04e67aa3a9d9bec8e5f50659de6 /include | |
| parent | c7bb0a9638a8929a5b664f16032c23a55a84be70 (diff) | |
| parent | c08eeb95ca78625cf3f8a96bd04320c57c50d0f1 (diff) | |
| download | afl++-a2eb1f14126cffd046c44d5e87e945ed2699cec5.tar.gz | |
Merge pull request #1404 from AFLplusplus/dev
push to stable
Diffstat (limited to 'include')
| -rw-r--r-- | include/afl-fuzz.h | 15 | ||||
| -rw-r--r-- | include/debug.h | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 8bb61e22..9992e841 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -230,12 +230,13 @@ enum { /* 12 */ STAGE_EXTRAS_UO, /* 13 */ STAGE_EXTRAS_UI, /* 14 */ STAGE_EXTRAS_AO, - /* 15 */ STAGE_HAVOC, - /* 16 */ STAGE_SPLICE, - /* 17 */ STAGE_PYTHON, - /* 18 */ STAGE_CUSTOM_MUTATOR, - /* 19 */ STAGE_COLORIZATION, - /* 20 */ STAGE_ITS, + /* 15 */ STAGE_EXTRAS_AI, + /* 16 */ STAGE_HAVOC, + /* 17 */ STAGE_SPLICE, + /* 18 */ STAGE_PYTHON, + /* 19 */ STAGE_CUSTOM_MUTATOR, + /* 20 */ STAGE_COLORIZATION, + /* 21 */ STAGE_ITS, STAGE_NUM_MAX @@ -1098,7 +1099,7 @@ int statsd_format_metric(afl_state_t *afl, char *buff, size_t bufflen); /* Run */ void sync_fuzzers(afl_state_t *); -u32 write_to_testcase(afl_state_t *, void *, u32, u32); +u32 write_to_testcase(afl_state_t *, void **, u32, u32); u8 calibrate_case(afl_state_t *, struct queue_entry *, u8 *, u32, u8); u8 trim_case(afl_state_t *, struct queue_entry *, u8 *); u8 common_fuzz_stuff(afl_state_t *, u8 *, u32); diff --git a/include/debug.h b/include/debug.h index e2ee16a8..c2f20f0f 100644 --- a/include/debug.h +++ b/include/debug.h @@ -388,6 +388,8 @@ static inline const char *colorfilter(const char *x) { \ } while (1); \ \ + \ + \ } while (0) #define ck_read(fd, buf, len, fn) \ |