diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2019-11-11 14:36:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 14:36:06 +0100 |
| commit | 659db7e421b47da4b04110a141d9c20307f74ecc (patch) | |
| tree | 18f9c38cc5270adcf445a62b974712cead4a01c4 /src/afl-fuzz-globals.c | |
| parent | cd84339bccc104a51a5da614a9f82cc4ae615cce (diff) | |
| parent | 01d55372441960c435af8f3bd6b61d1302042728 (diff) | |
| download | afl++-659db7e421b47da4b04110a141d9c20307f74ecc.tar.gz | |
Merge branch 'master' into radamsa
Diffstat (limited to 'src/afl-fuzz-globals.c')
| -rw-r--r-- | src/afl-fuzz-globals.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/afl-fuzz-globals.c b/src/afl-fuzz-globals.c index da134807..50b6b802 100644 --- a/src/afl-fuzz-globals.c +++ b/src/afl-fuzz-globals.c @@ -2,7 +2,7 @@ american fuzzy lop++ - globals declarations ------------------------------------------- - Originally written by Michal Zalewski <lcamtuf@google.com> + Originally written by Michal Zalewski Now maintained by by Marc Heuse <mh@mh-sec.de>, Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and @@ -74,8 +74,8 @@ u8 *in_dir, /* Input directory with test cases */ *file_extension, /* File extension */ *orig_cmdline; /* Original command line */ u8 *doc_path, /* Path to documentation dir */ - *infoexec, /* Command to execute on a new crash */ - *out_file; /* File to fuzz, if any */ + *infoexec, /* Command to execute on a new crash */ + *out_file; /* File to fuzz, if any */ u32 exec_tmout = EXEC_TIMEOUT; /* Configurable exec timeout (ms) */ u32 hang_tmout = EXEC_TIMEOUT; /* Timeout used for hang det (ms) */ @@ -125,7 +125,8 @@ u8 skip_deterministic, /* Skip deterministic stages? */ deferred_mode, /* Deferred forkserver mode? */ fixed_seed, /* do not reseed */ fast_cal, /* Try to calibrate faster? */ - uses_asan; /* Target uses ASAN? */ + uses_asan, /* Target uses ASAN? */ + disable_trim; /* Never trim in fuzz_one */ s32 out_fd, /* Persistent fd for out_file */ #ifndef HAVE_ARC4RANDOM |