diff options
| author | van Hauser <vh@thc.org> | 2020-06-17 15:05:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 15:05:14 +0200 |
| commit | 0dc9967984df3f9c250d4c27b6de1cbd4cac3eb3 (patch) | |
| tree | ca6096f1d22ba87c262bdeaf57455520ef3143e2 /llvm_mode/afl-clang-fast.c | |
| parent | 12bdefe00e38cdc3dd8cb028eeac325ab2e94e16 (diff) | |
| parent | 889e54eab858b1928f74a8c179b32275b62f2286 (diff) | |
| download | afl++-0dc9967984df3f9c250d4c27b6de1cbd4cac3eb3.tar.gz | |
Merge pull request #403 from AFLplusplus/dev
push to master
Diffstat (limited to 'llvm_mode/afl-clang-fast.c')
| -rw-r--r-- | llvm_mode/afl-clang-fast.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index 75504ea5..6604b57c 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -464,7 +464,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { } -#ifdef USEMMAP +#if defined(USEMMAP) && !defined(__HAIKU__) cc_params[cc_par_cnt++] = "-lrt"; #endif @@ -500,7 +500,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { "unsigned char *__afl_fuzz_alt_ptr;"; cc_params[cc_par_cnt++] = "-D__AFL_FUZZ_TESTCASE_BUF=(__afl_fuzz_ptr ? __afl_fuzz_ptr : " - "(__afl_fuzz_alt_ptr = malloc(1 * 1024 * 1024)))"; + "(__afl_fuzz_alt_ptr = (unsigned char *) malloc(1 * 1024 * 1024)))"; cc_params[cc_par_cnt++] = "-D__AFL_FUZZ_TESTCASE_LEN=(__afl_fuzz_ptr ? *__afl_fuzz_len : read(0, " "__afl_fuzz_alt_ptr, 1 * 1024 * 1024))"; @@ -757,12 +757,14 @@ int main(int argc, char **argv, char **envp) { if (instrument_mode == 0) { -#ifndef USE_TRACE_PC - if (getenv("AFL_LLVM_WHITELIST")) - instrument_mode = INSTRUMENT_AFL; - else +#if LLVM_VERSION_MAJOR <= 6 + instrument_mode = INSTRUMENT_AFL; +#else + if (getenv("AFL_LLVM_WHITELIST")) + instrument_mode = INSTRUMENT_AFL; + else + instrument_mode = INSTRUMENT_PCGUARD; #endif - instrument_mode = INSTRUMENT_PCGUARD; } |