diff options
| -rw-r--r-- | docs/Changelog.md | 2 | ||||
| -rw-r--r-- | src/afl-fuzz.c | 25 |
2 files changed, 5 insertions, 22 deletions
diff --git a/docs/Changelog.md b/docs/Changelog.md index d45b49fe..d61ce8ec 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -15,8 +15,6 @@ command line tool! See custom_mutators/aflpp/standalone/ - display the state of the fuzzing run in the UI :-) - fix timeout setting if '+' is used or a session is restarted - - allow to disable CMPLOG with '-c -' (e.g. afl.rs enforces '-c 0' on - every instance which is counterproductive. - afl-cmin/afl-cmin.bash: - fixed a bug inherited from vanilla AFL where a coverage of map[123] = 11 would be the same as map[1123] = 1 diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index e0e54b49..9afece66 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -180,8 +180,7 @@ static void usage(u8 *argv0, int more_help) { "it.\n" " if using QEMU/FRIDA or the fuzzing target is " "compiled\n" - " for CmpLog then use '-c 0'. To disable Cmplog use '-c " - "-'.\n" + " for CmpLog then just use -c 0.\n" " -l cmplog_opts - CmpLog configuration values (e.g. \"2ATR\"):\n" " 1=small files, 2=larger files (default), 3=all " "files,\n" @@ -595,23 +594,8 @@ int main(int argc, char **argv_orig, char **envp) { case 'c': { - if (strcmp(optarg, "-") == 0) { - - if (afl->shm.cmplog_mode) { - - ACTF("Disabling cmplog again because of '-c -'."); - afl->shm.cmplog_mode = 0; - afl->cmplog_binary = NULL; - - } - - } else { - - afl->shm.cmplog_mode = 1; - afl->cmplog_binary = ck_strdup(optarg); - - } - + afl->shm.cmplog_mode = 1; + afl->cmplog_binary = ck_strdup(optarg); break; } @@ -1516,7 +1500,8 @@ int main(int argc, char **argv_orig, char **envp) { if (!afl->use_banner) { afl->use_banner = argv[optind]; } - if (afl->shm.cmplog_mode && strcmp("0", afl->cmplog_binary) == 0) { + if (afl->shm.cmplog_mode && + (!strcmp("-", afl->cmplog_binary) || !strcmp("0", afl->cmplog_binary))) { afl->cmplog_binary = strdup(argv[optind]); |