diff options
| author | van Hauser <vh@thc.org> | 2019-12-31 12:52:10 +0100 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2019-12-31 12:52:10 +0100 |
| commit | 842cd9dec3c4c83d660d96dcdb3f5cf0c6e6f4fb (patch) | |
| tree | a6e5e225b4644f80c003c1eaadeaf8c0d4edd129 | |
| parent | 4b4effe3437cd1ebe6486c3e0fa591011bc3496e (diff) | |
| download | afl++-842cd9dec3c4c83d660d96dcdb3f5cf0c6e6f4fb.tar.gz | |
final touches before 2.602.60c
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | docs/ChangeLog | 2 | ||||
| -rw-r--r-- | llvm_mode/afl-clang-fast.c | 18 |
3 files changed, 17 insertions, 4 deletions
@@ -326,7 +326,6 @@ clean: $(MAKE) -C qemu_mode/unsigaction clean $(MAKE) -C qemu_mode/libcompcov clean $(MAKE) -C src/third_party/libradamsa/ clean - -test -e unicorn_mode/unicorn/Makefile && $(MAKE) -C unicorn_mode/unicorn clean -rm -rf unicorn_mode/unicorn distrib: all radamsa diff --git a/docs/ChangeLog b/docs/ChangeLog index 8492d7fd..a5e3efcd 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -23,7 +23,7 @@ Version ++2.59d (develop): - added preeny's desock_dup ld_preload library as ./experimental/socket_fuzzing for network fuzzing - added AFL_AS_FORCE_INSTRUMENT environment variable for afl-as - this is - for retrorewrite project + for the retrorewrite project - we now set QEMU_SET_ENV from AFL_PRELOAD when qemu_mode is used diff --git a/llvm_mode/afl-clang-fast.c b/llvm_mode/afl-clang-fast.c index fe91a01b..a1da83b2 100644 --- a/llvm_mode/afl-clang-fast.c +++ b/llvm_mode/afl-clang-fast.c @@ -49,7 +49,11 @@ static void find_obj(u8* argv0) { if (afl_path) { +#ifdef __ANDROID__ + tmp = alloc_printf("%s/afl-llvm-rt.so", afl_path); +#else tmp = alloc_printf("%s/afl-llvm-rt.o", afl_path); +#endif if (!access(tmp, R_OK)) { @@ -73,7 +77,11 @@ static void find_obj(u8* argv0) { dir = ck_strdup(argv0); *slash = '/'; +#ifdef __ANDROID__ + tmp = alloc_printf("%s/afl-llvm-rt.so", afl_path); +#else tmp = alloc_printf("%s/afl-llvm-rt.o", dir); +#endif if (!access(tmp, R_OK)) { @@ -88,8 +96,14 @@ static void find_obj(u8* argv0) { } +#ifdef __ANDROID__ + if (!access(AFL_PATH "/afl-llvm-rt.so", R_OK)) { + +#else if (!access(AFL_PATH "/afl-llvm-rt.o", R_OK)) { +#endif + obj_path = AFL_PATH; return; @@ -358,7 +372,7 @@ static void edit_params(u32 argc, char** argv) { } - //#ifndef __ANDROID__ // not sure, we might need these ifdefs for Android +#ifndef __ANDROID__ switch (bit_mode) { case 0: @@ -383,7 +397,7 @@ static void edit_params(u32 argc, char** argv) { } - //#endif +#endif } |