Fix dev branch for android (#710)

* android: replace rindex with strrchr

* android: support 64bit only due to 128bit integer not supported by 32bit system

Co-authored-by: joeyjiaojg@qq.com <joeyjiaojg@163.com>
This commit is contained in:
Joey Jiaojg
2021-01-28 12:51:45 +08:00
committed by GitHub
parent 2044c7e2b5
commit 47f62eb0ca
3 changed files with 5 additions and 3 deletions

View File

@ -36,6 +36,7 @@ cc_defaults {
cc_binary { cc_binary {
name: "afl-fuzz", name: "afl-fuzz",
host_supported: true, host_supported: true,
compile_multilib: "64",
defaults: [ defaults: [
"afl-defaults", "afl-defaults",
@ -64,6 +65,7 @@ cc_binary {
"src/afl-common.c", "src/afl-common.c",
"src/afl-sharedmem.c", "src/afl-sharedmem.c",
"src/afl-forkserver.c", "src/afl-forkserver.c",
"src/afl-performance.c",
], ],
} }
@ -152,7 +154,7 @@ cc_binary_host {
cc_library_static { cc_library_static {
name: "afl-llvm-rt", name: "afl-llvm-rt",
compile_multilib: "both", compile_multilib: "64",
vendor_available: true, vendor_available: true,
host_supported: true, host_supported: true,
recovery_available: true, recovery_available: true,

View File

@ -469,7 +469,7 @@ void read_foreign_testcases(afl_state_t *afl, int first) {
if (first) ACTF("Scanning '%s'...", afl->foreign_syncs[iter].dir); if (first) ACTF("Scanning '%s'...", afl->foreign_syncs[iter].dir);
time_t ctime_max = 0; 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 (!name) { name = afl->foreign_syncs[iter].dir; }
if (!strcmp(name, "queue") || !strcmp(name, "out") || if (!strcmp(name, "queue") || !strcmp(name, "out") ||
!strcmp(name, "default")) { !strcmp(name, "default")) {

View File

@ -143,7 +143,7 @@ void read_library_information(void) {
b = buf; b = buf;
m = index(buf, '-'); m = index(buf, '-');
e = index(buf, ' '); e = index(buf, ' ');
if ((n = rindex(buf, '/')) == NULL) n = rindex(buf, ' '); if ((n = strrchr(buf, '/')) == NULL) n = strrchr(buf, ' ');
if (n && if (n &&
((*n >= '0' && *n <= '9') || *n == '[' || *n == '{' || *n == '(')) ((*n >= '0' && *n <= '9') || *n == '[' || *n == '{' || *n == '('))
n = NULL; n = NULL;