diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 12:40:03 +0200 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 12:40:03 +0200 |
| commit | 2c87e68ad673f2785ecfc6887121124bc9287106 (patch) | |
| tree | de3476bf6ce20f9d44e3e5ac798dc7222bae8069 | |
| parent | 26e690c220a35ad5577eb52ca47dc27d0c737fa9 (diff) | |
| parent | b63dd7a464ce654647b7710eb491ecf0e48c443f (diff) | |
| download | afl++-2c87e68ad673f2785ecfc6887121124bc9287106.tar.gz | |
Merge branch 'dev' of github.com:vanhauser-thc/AFLplusplus into dev
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | docs/Changelog.md | 1 | ||||
| -rw-r--r-- | llvm_mode/afl-clang-fast.c | 4 | ||||
| -rw-r--r-- | src/afl-fuzz-redqueen.c | 4 |
4 files changed, 9 insertions, 3 deletions
@@ -145,7 +145,7 @@ $ sudo make install Note that "make distrib" also builds llvm_mode, qemu_mode, unicorn_mode and more. If you just want plain afl then do "make all", however compiling and using at least llvm_mode is highly recommended for much better results - -hence in this case +hence in this case ```shell $ make source-only @@ -178,6 +178,7 @@ These build options exist: * STATIC - compile AFL++ static * ASAN_BUILD - compiles with memory sanitizer for debug purposes * PROFILING - compile with profiling information (gprof) +* NO_PYTHON - disable python support * AFL_NO_X86 - if compiling on non-intel/amd platforms * LLVM_CONFIG - if your distro doesn't use the standard name for llvm-config (e.g. Debian) diff --git a/docs/Changelog.md b/docs/Changelog.md index 2c8bff3d..e1e558b7 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -26,6 +26,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>. - more refactoring - if AFL_CC/AFL_CXX is set but empty afl compilers did fail, fixed (this bug is in vanilla afl too) + - added NO_PYTHON flag to disable python support when building afl-fuzz ### Version ++2.63c (release): diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index 52a4829c..b121ea97 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -548,6 +548,10 @@ int main(int argc, char **argv, char **envp) { if ((ptr = getenv("AFL_LLVM_INSTRUMENT")) != NULL) { + if (strncasecmp(ptr, "default", strlen("default")) == 0 || + strncasecmp(ptr, "afl", strlen("afl")) == 0 || + strncasecmp(ptr, "classic", strlen("classic")) == 0 ) + instrument_mode = INSTRUMENT_DEFAULT; if (strncasecmp(ptr, "cfg", strlen("cfg")) == 0 || strncasecmp(ptr, "instrim", strlen("instrim")) == 0) instrument_mode = INSTRUMENT_CFG; diff --git a/src/afl-fuzz-redqueen.c b/src/afl-fuzz-redqueen.c index 1ba36245..c8d5565f 100644 --- a/src/afl-fuzz-redqueen.c +++ b/src/afl-fuzz-redqueen.c @@ -490,9 +490,9 @@ static u8 rtn_fuzz(afl_state_t *afl, u32 key, u8 *orig_buf, u8 *buf, u32 len) { u32 loggeds = h->hits; if (h->hits > CMP_MAP_RTN_H) loggeds = CMP_MAP_RTN_H; - u8 status; + u8 status = 0; // opt not in the paper - u32 fails; + u32 fails = 0; u8 found_one = 0; for (i = 0; i < loggeds; ++i) { |