diff options
| author | hexcoder- <heiko@hexco.de> | 2020-12-08 23:27:14 +0100 |
|---|---|---|
| committer | hexcoder- <heiko@hexco.de> | 2020-12-08 23:27:14 +0100 |
| commit | 1dbb1c71938831eba21cc7f96222a63c54f2eb98 (patch) | |
| tree | 1301b09815e5aea611bd9338a9160a5193eaab77 /src | |
| parent | 9534bb87b1e2c428024879ef4de7337f8fccda5a (diff) | |
| parent | 4e96447b43970acf8e43140aebdbccbe49dfd688 (diff) | |
| download | afl++-1dbb1c71938831eba21cc7f96222a63c54f2eb98.tar.gz | |
Merge branch 'dev' of https://github.com/AFLplusplus/AFLplusplus into dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/afl-forkserver.c | 1 | ||||
| -rw-r--r-- | src/afl-showmap.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c index 38cd529f..5a8e56b2 100644 --- a/src/afl-forkserver.c +++ b/src/afl-forkserver.c @@ -63,6 +63,7 @@ static void fsrv_exec_child(afl_forkserver_t *fsrv, char **argv) { execv(fsrv->target_path, argv); WARNF("Execv failed in forkserver."); + } /* Initializes the struct */ diff --git a/src/afl-showmap.c b/src/afl-showmap.c index e07e76c8..34a4f30d 100644 --- a/src/afl-showmap.c +++ b/src/afl-showmap.c @@ -287,6 +287,8 @@ static void showmap_run_target_forkserver(afl_forkserver_t *fsrv, u8 *mem, afl_fsrv_write_to_testcase(fsrv, mem, len); + if (!quiet_mode) { SAYF("-- Program output begins --\n" cRST); } + if (afl_fsrv_run_target(fsrv, fsrv->exec_tmout, &stop_soon) == FSRV_RUN_ERROR) { @@ -711,6 +713,7 @@ int main(int argc, char **argv_orig, char **envp) { case 'C': collect_coverage = 1; + quiet_mode = 1; break; case 'i': @@ -817,7 +820,6 @@ int main(int argc, char **argv_orig, char **envp) { case 'q': - if (quiet_mode) { FATAL("Multiple -q options not supported"); } quiet_mode = 1; break; @@ -1189,7 +1191,7 @@ int main(int argc, char **argv_orig, char **envp) { } - if (!quiet_mode) { + if (!quiet_mode || collect_coverage) { if (!tcnt) { FATAL("No instrumentation detected" cRST); } OKF("Captured %u tuples (highest value %u, total values %llu) in " |