diff options
| -rw-r--r-- | include/afl-fuzz.h | 14 | ||||
| -rw-r--r-- | include/alloc-inl.h | 6 | ||||
| -rw-r--r-- | llvm_mode/afl-clang-fast.c | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 3e121851..b5c5afaf 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -237,8 +237,8 @@ extern u8 *in_dir, /* Input directory with test cases */ *use_banner, /* Display banner */ *in_bitmap, /* Input bitmap */ *file_extension, /* File extension */ - *orig_cmdline; /* Original command line */ -extern u8 *doc_path, /* Path to documentation dir */ + *orig_cmdline, /* Original command line */ + *doc_path, /* Path to documentation dir */ *target_path, /* Path to target binary */ *out_file; /* File to fuzz, if any */ @@ -532,11 +532,11 @@ u8 common_fuzz_stuff(char**, u8*, u32); /* Fuzz one */ -u8 fuzz_one_original(char**); -static u8 pilot_fuzzing(char**); -u8 core_fuzzing(char**); -void pso_updating(void); -u8 fuzz_one(char**); +u8 fuzz_one_original(char**); +u8 pilot_fuzzing(char**); +u8 core_fuzzing(char**); +void pso_updating(void); +u8 fuzz_one(char**); /* Init */ diff --git a/include/alloc-inl.h b/include/alloc-inl.h index 4a4beff1..302d15b6 100644 --- a/include/alloc-inl.h +++ b/include/alloc-inl.h @@ -104,20 +104,26 @@ /* #define CHECK_PTR(_p) do { \ \ + \ if (_p) { \ \ + \ if (ALLOC_C1(_p) ^ ALLOC_MAGIC_C1) {\ \ + \ if (ALLOC_C1(_p) == ALLOC_MAGIC_F) \ ABORT("Use after free."); \ else ABORT("Corrupted head alloc canary."); \ \ } \ + \ if (ALLOC_C2(_p) ^ ALLOC_MAGIC_C2) \ ABORT("Corrupted tail alloc canary."); \ \ } \ \ + \ + \ } while (0) */ diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index 666fd043..ed320716 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -173,8 +173,8 @@ static void edit_params(u32 argc, char** argv) { "-fsanitize-coverage=trace-pc-guard"; // edge coverage by default // cc_params[cc_par_cnt++] = "-mllvm"; // cc_params[cc_par_cnt++] = - // "-fsanitize-coverage=trace-cmp,trace-div,trace-gep"; cc_params[cc_par_cnt++] - // = "-sanitizer-coverage-block-threshold=0"; + // "-fsanitize-coverage=trace-cmp,trace-div,trace-gep"; + // cc_params[cc_par_cnt++] = "-sanitizer-coverage-block-threshold=0"; #else cc_params[cc_par_cnt++] = "-Xclang"; cc_params[cc_par_cnt++] = "-load"; |