diff options
| author | hexcoder- <heiko@hexco.de> | 2020-04-08 17:39:19 +0200 |
|---|---|---|
| committer | hexcoder- <heiko@hexco.de> | 2020-04-08 17:39:19 +0200 |
| commit | 9b3e6112ff821be5a0e0ff475f39227f94c31aae (patch) | |
| tree | 0a651a03c6ad4077cb3eb3463ceffff18872bb39 | |
| parent | 7663e7dd05ca7d3da6120c63bd8bacf3c2894817 (diff) | |
| parent | 2e29e64a3f3ff8cc334d1d9e920e8dcfe74881b8 (diff) | |
| download | afl++-9b3e6112ff821be5a0e0ff475f39227f94c31aae.tar.gz | |
Merge branch 'dev' of https://github.com/vanhauser-thc/AFLplusplus into dev
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | src/afl-fuzz-extras.c | 2 | ||||
| -rw-r--r-- | src/afl-showmap.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 25928210..0cbeaa81 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -36,6 +36,7 @@ SH_PROGS = afl-plot afl-cmin afl-cmin.bash afl-whatsup afl-system-config MANPAGES=$(foreach p, $(PROGS) $(SH_PROGS), $(p).8) afl-as.8 ASAN_OPTIONS=detect_leaks=0 +ifeq "$(findstring android, $(shell $(CC) --version 2>/dev/null))" "" ifeq "$(shell echo 'int main() {return 0; }' | $(CC) $(CFLAGS) -Werror -x c - -flto=full -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" CFLAGS_FLTO ?= -flto=full else @@ -47,6 +48,7 @@ else endif endif endif +endif ifneq "$(shell uname)" "Darwin" ifeq "$(shell echo 'int main() {return 0; }' | $(CC) $(CFLAGS) -Werror -x c - -march=native -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1" diff --git a/src/afl-fuzz-extras.c b/src/afl-fuzz-extras.c index 4dd1647c..16806934 100644 --- a/src/afl-fuzz-extras.c +++ b/src/afl-fuzz-extras.c @@ -451,7 +451,7 @@ void load_auto(afl_state_t *afl) { u8 *fn = alloc_printf("%s/.state/auto_extras/auto_%06u", afl->in_dir, i); s32 fd, len; - fd = open(fn, O_RDONLY, 0600); + fd = open(fn, O_RDONLY); if (fd < 0) { diff --git a/src/afl-showmap.c b/src/afl-showmap.c index f8a38c36..e4463dc4 100644 --- a/src/afl-showmap.c +++ b/src/afl-showmap.c @@ -154,7 +154,8 @@ static u32 write_results_to_file(afl_forkserver_t *fsrv, u8 *outfile) { if (!strncmp(outfile, "/dev/", 5)) { - fd = open(outfile, O_WRONLY, 0600); + fd = open(outfile, O_WRONLY); + if (fd < 0) PFATAL("Unable to open '%s'", fsrv->out_file); } else if (!strcmp(outfile, "-")) { |