diff options
| -rw-r--r-- | include/afl-fuzz.h | 4 | ||||
| -rw-r--r-- | include/afl-mutations.h | 4 | ||||
| -rw-r--r-- | src/afl-common.c | 6 | ||||
| -rw-r--r-- | src/afl-forkserver.c | 3 | ||||
| -rw-r--r-- | src/afl-fuzz-run.c | 1 |
5 files changed, 14 insertions, 4 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 5efe5144..74b04fdb 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -139,6 +139,10 @@ #define AFL_RAND_RETURN u32 #endif +#ifndef INTERESTING_32_LEN + #error INTERESTING_32_LEN not defined - BUG! +#endif + extern s8 interesting_8[INTERESTING_8_LEN]; extern s16 interesting_16[INTERESTING_8_LEN + INTERESTING_16_LEN]; extern s32 diff --git a/include/afl-mutations.h b/include/afl-mutations.h index 79cf7c6a..1e5a6934 100644 --- a/include/afl-mutations.h +++ b/include/afl-mutations.h @@ -33,6 +33,10 @@ #define MUT_STRATEGY_ARRAY_SIZE 256 +#ifndef INTERESTING_32 + #error INTERESTING_32 is not defined - BUG! +#endif + s8 interesting_8[] = {INTERESTING_8}; s16 interesting_16[] = {INTERESTING_8, INTERESTING_16}; s32 interesting_32[] = {INTERESTING_8, INTERESTING_16, INTERESTING_32}; diff --git a/src/afl-common.c b/src/afl-common.c index 9a27824d..8af49e19 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -999,7 +999,7 @@ inline u64 get_cur_time(void) { struct timespec ts; int rc = clock_gettime(CLOCK_MONOTONIC_COARSE, &ts); - if (rc == -1) { + if (unlikely(rc == -1)) { PFATAL("Failed to obtain timestamp (errno = %i: %s)\n", errno, strerror(errno)); @@ -1012,11 +1012,11 @@ inline u64 get_cur_time(void) { /* Get unix time in microseconds */ -u64 get_cur_time_us(void) { +inline u64 get_cur_time_us(void) { struct timespec ts; int rc = clock_gettime(CLOCK_MONOTONIC_COARSE, &ts); - if (rc == -1) { + if (unlikely(rc == -1)) { PFATAL("Failed to obtain timestamp (errno = %i: %s)\n", errno, strerror(errno)); diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c index beb6bdeb..a082982c 100644 --- a/src/afl-forkserver.c +++ b/src/afl-forkserver.c @@ -578,7 +578,8 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv, void *nyx_config = fsrv->nyx_handlers->nyx_config_load(fsrv->target_path); fsrv->nyx_handlers->nyx_config_set_workdir_path(nyx_config, workdir_path); - fsrv->nyx_handlers->nyx_config_set_input_buffer_size(nyx_config, fsrv->max_length); + fsrv->nyx_handlers->nyx_config_set_input_buffer_size(nyx_config, + fsrv->max_length); fsrv->nyx_handlers->nyx_config_set_input_buffer_write_protection(nyx_config, true); diff --git a/src/afl-fuzz-run.c b/src/afl-fuzz-run.c index b62db1ea..4e2cceff 100644 --- a/src/afl-fuzz-run.c +++ b/src/afl-fuzz-run.c @@ -1195,3 +1195,4 @@ common_fuzz_stuff(afl_state_t *afl, u8 *out_buf, u32 len) { return 0; } + |