From 0dd1c39b5a011c34c02c4c2ae3a975ffaa01ca75 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Sat, 18 Jun 2022 02:35:31 +0200 Subject: check for empty env var as well --- src/afl-common.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/afl-common.c') diff --git a/src/afl-common.c b/src/afl-common.c index eca7d272..abf7e70a 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -715,17 +715,23 @@ char *get_afl_env(char *env) { char *val; - if ((val = getenv(env)) != NULL) { + if ((val = getenv(env))) { - if (!be_quiet) { + if (*val) { + + if (!be_quiet) { + + OKF("Loaded environment variable %s with value %s", env, val); - OKF("Loaded environment variable %s with value %s", env, val); + } + + return val; } } - return val; + return NULL; } @@ -1243,4 +1249,3 @@ s32 create_file(u8 *fn) { return fd; } - -- cgit 1.4.1 From bf6a0159a934b750d22cc34210544fdb3418df7f Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Sat, 18 Jun 2022 02:37:11 +0200 Subject: formatting --- src/afl-common.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/afl-common.c') diff --git a/src/afl-common.c b/src/afl-common.c index abf7e70a..cbf20fba 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -1249,3 +1249,4 @@ s32 create_file(u8 *fn) { return fd; } + -- cgit 1.4.1 From 0c3ba7d22719c694dafe1f053a9c8f8bad3993a7 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Sat, 18 Jun 2022 07:23:06 -0400 Subject: clarity --- src/afl-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/afl-common.c') diff --git a/src/afl-common.c b/src/afl-common.c index cbf20fba..b232b445 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -721,7 +721,7 @@ char *get_afl_env(char *env) { if (!be_quiet) { - OKF("Loaded environment variable %s with value %s", env, val); + OKF("Enabled environment variable %s with value %s", env, val); } -- cgit 1.4.1 From 1a4c0d2ecd428c8d3e6be8509738971861ddb5f2 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Mon, 20 Jun 2022 17:59:14 +0200 Subject: nits --- Android.bp | 1 + src/afl-cc.c | 2 +- src/afl-common.c | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/afl-common.c') diff --git a/Android.bp b/Android.bp index ac1d5cb6..dfbfd281 100644 --- a/Android.bp +++ b/Android.bp @@ -76,6 +76,7 @@ cc_binary { srcs: [ "src/afl-fuzz*.c", "src/afl-common.c", + "src/afl-forkserver.c", "src/afl-sharedmem.c", "src/afl-forkserver.c", "src/afl-performance.c", diff --git a/src/afl-cc.c b/src/afl-cc.c index 2667ae28..4a56169f 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -396,7 +396,7 @@ static void edit_params(u32 argc, char **argv, char **envp) { snprintf(llvm_fullpath, sizeof(llvm_fullpath), "%s/clang", LLVM_BINDIR); else - snprintf(llvm_fullpath, sizeof(llvm_fullpath), CLANG_BIN); + snprintf(llvm_fullpath, sizeof(llvm_fullpath), "%s", CLANG_BIN); alt_cc = llvm_fullpath; } diff --git a/src/afl-common.c b/src/afl-common.c index b232b445..7f482e7d 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -25,8 +25,12 @@ #include #include -#define _GNU_SOURCE -#define __USE_GNU +#ifndef _GNU_SOURCE + #define _GNU_SOURCE +#endif +#ifndef __USE_GNU + #define __USE_GNU +#endif #include #include #include @@ -718,7 +722,7 @@ char *get_afl_env(char *env) { if ((val = getenv(env))) { if (*val) { - + if (!be_quiet) { OKF("Enabled environment variable %s with value %s", env, val); -- cgit 1.4.1