Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus

This commit is contained in:
Andrea Fioraldi
2020-01-06 11:46:23 +01:00
65 changed files with 212 additions and 118 deletions

View File

@ -50,7 +50,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)) {
@ -74,7 +78,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)) {
@ -89,8 +97,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;
@ -359,7 +373,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:
@ -384,7 +398,7 @@ static void edit_params(u32 argc, char** argv) {
}
//#endif
#endif
}