aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp4
-rw-r--r--src/afl-fuzz-init.c2
-rw-r--r--utils/afl_untracer/afl-untracer.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 5d6f0433..ee076d1e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,6 +36,7 @@ cc_defaults {
cc_binary {
name: "afl-fuzz",
host_supported: true,
+ compile_multilib: "64",
defaults: [
"afl-defaults",
@@ -64,6 +65,7 @@ cc_binary {
"src/afl-common.c",
"src/afl-sharedmem.c",
"src/afl-forkserver.c",
+ "src/afl-performance.c",
],
}
@@ -152,7 +154,7 @@ cc_binary_host {
cc_library_static {
name: "afl-llvm-rt",
- compile_multilib: "both",
+ compile_multilib: "64",
vendor_available: true,
host_supported: true,
recovery_available: true,
diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c
index a428923d..5f5e65cd 100644
--- a/src/afl-fuzz-init.c
+++ b/src/afl-fuzz-init.c
@@ -469,7 +469,7 @@ void read_foreign_testcases(afl_state_t *afl, int first) {
if (first) ACTF("Scanning '%s'...", afl->foreign_syncs[iter].dir);
time_t ctime_max = 0;
- u8 * name = rindex(afl->foreign_syncs[iter].dir, '/');
+ u8 * name = strrchr(afl->foreign_syncs[iter].dir, '/');
if (!name) { name = afl->foreign_syncs[iter].dir; }
if (!strcmp(name, "queue") || !strcmp(name, "out") ||
!strcmp(name, "default")) {
diff --git a/utils/afl_untracer/afl-untracer.c b/utils/afl_untracer/afl-untracer.c
index 695f8dd1..f3894a06 100644
--- a/utils/afl_untracer/afl-untracer.c
+++ b/utils/afl_untracer/afl-untracer.c
@@ -143,7 +143,7 @@ void read_library_information(void) {
b = buf;
m = index(buf, '-');
e = index(buf, ' ');
- if ((n = rindex(buf, '/')) == NULL) n = rindex(buf, ' ');
+ if ((n = strrchr(buf, '/')) == NULL) n = strrchr(buf, ' ');
if (n &&
((*n >= '0' && *n <= '9') || *n == '[' || *n == '{' || *n == '('))
n = NULL;