diff options
| author | vanhauser-thc <vh@thc.org> | 2021-12-29 18:24:47 +0100 |
|---|---|---|
| committer | vanhauser-thc <vh@thc.org> | 2021-12-29 18:24:47 +0100 |
| commit | 02082bcd2e0928a436593ef67ba84af1c87287e4 (patch) | |
| tree | cb75b48bb24b1ae82b7147da5955a7c51d81c97a /src | |
| parent | fa6a0aba6100c2d9cca6904319ca0b53890d076f (diff) | |
| download | afl++-02082bcd2e0928a436593ef67ba84af1c87287e4.tar.gz | |
afl-cc lto fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/afl-cc.c | 11 | ||||
| -rw-r--r-- | src/afl-forkserver.c | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/afl-cc.c b/src/afl-cc.c index f90f62a8..6771a5f4 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -556,7 +556,16 @@ static void edit_params(u32 argc, char **argv, char **envp) { if (lto_mode && !have_c) { u8 *ld_path = NULL; - if (getenv("AFL_REAL_LD")) { ld_path = strdup(getenv("AFL_REAL_LD")); } + if (getenv("AFL_REAL_LD")) { + + ld_path = strdup(getenv("AFL_REAL_LD")); + + } else { + + ld_path = strdup(AFL_REAL_LD); + + } + if (!ld_path || !*ld_path) { ld_path = strdup("ld.lld"); } if (!ld_path) { PFATAL("Could not allocate mem for ld_path"); } #if defined(AFL_CLANG_LDPATH) && LLVM_MAJOR >= 12 diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c index d34f9ce2..5ff82916 100644 --- a/src/afl-forkserver.c +++ b/src/afl-forkserver.c @@ -422,7 +422,6 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv, fsrv->map_size = fsrv->nyx_handlers->nyx_get_bitmap_buffer_size(fsrv->nyx_runner); - ; fsrv->real_map_size = fsrv->map_size; fsrv->trace_bits = @@ -1192,7 +1191,7 @@ u32 afl_fsrv_get_mapsize(afl_forkserver_t *fsrv, char **argv, void afl_fsrv_write_to_testcase(afl_forkserver_t *fsrv, u8 *buf, size_t len) { #ifdef __linux__ - if (fsrv->nyx_mode) { + if (unlikely(fsrv->nyx_mode)) { fsrv->nyx_handlers->nyx_set_afl_input(fsrv->nyx_runner, buf, len); return; @@ -1200,6 +1199,7 @@ void afl_fsrv_write_to_testcase(afl_forkserver_t *fsrv, u8 *buf, size_t len) { } #endif + #ifdef AFL_PERSISTENT_RECORD if (unlikely(fsrv->persistent_record)) { |