From 47d894747169692362eb0266017753e0838ecc2c Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Fri, 17 Jun 2022 12:10:11 -0400 Subject: require value in env --- src/afl-fuzz-init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c index 6a653a00..aedbd996 100644 --- a/src/afl-fuzz-init.c +++ b/src/afl-fuzz-init.c @@ -113,7 +113,7 @@ void bind_to_free_cpu(afl_state_t *afl) { u8 lockfile[PATH_MAX] = ""; s32 i; - if (afl->afl_env.afl_no_affinity && !afl->afl_env.afl_try_affinity) { + if (afl->afl_env.afl_no_affinity = 1 && afl->afl_env.afl_try_affinity != 1) { if (afl->cpu_to_bind != -1) { @@ -130,7 +130,7 @@ void bind_to_free_cpu(afl_state_t *afl) { if (!bind_cpu(afl, afl->cpu_to_bind)) { - if (afl->afl_env.afl_try_affinity) { + if (afl->afl_env.afl_try_affinity = 1) { WARNF( "Could not bind to requested CPU %d! Make sure you passed a valid " @@ -2957,4 +2957,3 @@ void save_cmdline(afl_state_t *afl, u32 argc, char **argv) { *buf = 0; } - -- cgit 1.4.1 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') 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 fc3b483450280f01c214853db5c4d30aa1eff1c1 Mon Sep 17 00:00:00 2001 From: Ruben ten Hove Date: Sat, 18 Jun 2022 02:35:40 +0200 Subject: revert previous changes --- src/afl-fuzz-init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c index aedbd996..6a653a00 100644 --- a/src/afl-fuzz-init.c +++ b/src/afl-fuzz-init.c @@ -113,7 +113,7 @@ void bind_to_free_cpu(afl_state_t *afl) { u8 lockfile[PATH_MAX] = ""; s32 i; - if (afl->afl_env.afl_no_affinity = 1 && afl->afl_env.afl_try_affinity != 1) { + if (afl->afl_env.afl_no_affinity && !afl->afl_env.afl_try_affinity) { if (afl->cpu_to_bind != -1) { @@ -130,7 +130,7 @@ void bind_to_free_cpu(afl_state_t *afl) { if (!bind_cpu(afl, afl->cpu_to_bind)) { - if (afl->afl_env.afl_try_affinity = 1) { + if (afl->afl_env.afl_try_affinity) { WARNF( "Could not bind to requested CPU %d! Make sure you passed a valid " @@ -2957,3 +2957,4 @@ void save_cmdline(afl_state_t *afl, u32 argc, char **argv) { *buf = 0; } + -- 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') 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') 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