From 92352951d7a8485bd2413009fcd052e85dc398fb Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Tue, 28 Jun 2022 11:52:05 +0200 Subject: nits --- src/afl-fuzz.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/afl-fuzz.c') diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index 7c33ba29..b23cef37 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -296,6 +296,7 @@ static void usage(u8 *argv0, int more_help) { " Supported formats are: 'dogstatsd', 'librato',\n" " 'signalfx' and 'influxdb'\n" "AFL_SYNC_TIME: sync time between fuzzing instances (in minutes)\n" + "AFL_NO_CRASH_README: do not create a README in the crashes directory\n" "AFL_TESTCACHE_SIZE: use a cache for testcases, improves performance (in MB)\n" "AFL_TMPDIR: directory to use for input file generation (ramdisk recommended)\n" "AFL_EARLY_FORKSERVER: force an early forkserver in an afl-clang-fast/\n" -- cgit 1.4.1 From 1759859ae2795ac5538b3a8e682d807d394c663e Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Thu, 7 Jul 2022 09:03:46 +0200 Subject: fix double free on exit for -c 0 on src cmplog --- src/afl-cc.c | 33 +++++++++++++++++---------------- src/afl-fuzz.c | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'src/afl-fuzz.c') diff --git a/src/afl-cc.c b/src/afl-cc.c index 96342659..246e01cd 100644 --- a/src/afl-cc.c +++ b/src/afl-cc.c @@ -424,21 +424,21 @@ static void edit_params(u32 argc, char **argv, char **envp) { char *fplugin_arg; - if (cmplog_mode) - { - fplugin_arg = alloc_printf("-fplugin=%s/afl-gcc-cmplog-pass.so", - obj_path); - cc_params[cc_par_cnt++] = fplugin_arg; - fplugin_arg = alloc_printf("-fplugin=%s/afl-gcc-cmptrs-pass.so", - obj_path); - cc_params[cc_par_cnt++] = fplugin_arg; - } - else - { - fplugin_arg = alloc_printf("-fplugin=%s/afl-gcc-pass.so", - obj_path); - cc_params[cc_par_cnt++] = fplugin_arg; - } + if (cmplog_mode) { + + fplugin_arg = + alloc_printf("-fplugin=%s/afl-gcc-cmplog-pass.so", obj_path); + cc_params[cc_par_cnt++] = fplugin_arg; + fplugin_arg = + alloc_printf("-fplugin=%s/afl-gcc-cmptrs-pass.so", obj_path); + cc_params[cc_par_cnt++] = fplugin_arg; + + } else { + + fplugin_arg = alloc_printf("-fplugin=%s/afl-gcc-pass.so", obj_path); + cc_params[cc_par_cnt++] = fplugin_arg; + + } cc_params[cc_par_cnt++] = "-fno-if-conversion"; cc_params[cc_par_cnt++] = "-fno-if-conversion2"; @@ -2166,7 +2166,8 @@ int main(int argc, char **argv, char **envp) { } - cmplog_mode = getenv("AFL_CMPLOG") || getenv("AFL_LLVM_CMPLOG") || getenv("AFL_GCC_CMPLOG"); + cmplog_mode = getenv("AFL_CMPLOG") || getenv("AFL_LLVM_CMPLOG") || + getenv("AFL_GCC_CMPLOG"); #if !defined(__ANDROID__) && !defined(ANDROID) ptr = find_object("afl-compiler-rt.o", argv[0]); diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index b23cef37..18367cf2 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -1469,7 +1469,7 @@ int main(int argc, char **argv_orig, char **envp) { if (afl->shm.cmplog_mode && (!strcmp("-", afl->cmplog_binary) || !strcmp("0", afl->cmplog_binary))) { - afl->cmplog_binary = argv[optind]; + afl->cmplog_binary = strdup(argv[optind]); } -- cgit 1.4.1