diff options
| author | van Hauser <vh@thc.org> | 2020-09-18 12:19:27 +0200 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2020-09-18 12:19:27 +0200 |
| commit | 44c0dc6d961853806a07fa05b948686392ea93fc (patch) | |
| tree | 9bffba8d20ed54e78526505df864f1dd367d0c38 | |
| parent | 1225f3aa70c797752c9a9a9c1e8b8aadf3a855dc (diff) | |
| download | afl++-44c0dc6d961853806a07fa05b948686392ea93fc.tar.gz | |
fix expand havoc
| -rw-r--r-- | instrumentation/afl-compiler-rt.o.c | 2 | ||||
| -rw-r--r-- | src/afl-fuzz.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c index 2fbefd70..f38af668 100644 --- a/instrumentation/afl-compiler-rt.o.c +++ b/instrumentation/afl-compiler-rt.o.c @@ -35,7 +35,7 @@ #include <sys/mman.h> #ifndef __HAIKU__ -#include <sys/shm.h> + #include <sys/shm.h> #endif #include <sys/wait.h> #include <sys/types.h> diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index 9196d78b..ea24011e 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -242,11 +242,11 @@ static int stricmp(char const *a, char const *b) { int main(int argc, char **argv_orig, char **envp) { - s32 opt, i; - u64 prev_queued = 0; - u32 sync_interval_cnt = 0, seek_to, show_help = 0, map_size = MAP_SIZE; - u8 * extras_dir[4]; - u8 mem_limit_given = 0, exit_1 = 0, debug = 0, extras_dir_cnt = 0; + s32 opt, i; + u64 prev_queued = 0; + u32 sync_interval_cnt = 0, seek_to, show_help = 0, map_size = MAP_SIZE; + u8 *extras_dir[4]; + u8 mem_limit_given = 0, exit_1 = 0, debug = 0, extras_dir_cnt = 0, have_p = 0; char **use_argv; struct timeval tv; @@ -364,6 +364,8 @@ int main(int argc, char **argv_orig, char **envp) { } + have_p = 1; + break; case 'e': @@ -1364,7 +1366,7 @@ int main(int argc, char **argv_orig, char **envp) { afl->expand_havoc = 2; break; case 2: - // afl->cycle_schedules = 1; + if (!have_p) afl->schedule = EXPLOIT; afl->expand_havoc = 3; break; case 3: |