diff options
| author | van Hauser <vh@thc.org> | 2022-10-29 15:12:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-29 15:12:07 +0200 |
| commit | 2d640558a09b03e9416b5d87e98cf938b38def9e (patch) | |
| tree | 36490ea5c663cc5b4f8e3bb94ccfae22c734cf69 /src/afl-showmap.c | |
| parent | 340647c5f1dda67957cf9f85b2af9e9ef7fb28af (diff) | |
| parent | ec19a9b06881b6e69e5d15ea3fba527a0b53fd55 (diff) | |
| download | afl++-2d640558a09b03e9416b5d87e98cf938b38def9e.tar.gz | |
Merge pull request #1573 from AFLplusplus/dev
push to stable
Diffstat (limited to 'src/afl-showmap.c')
| -rw-r--r-- | src/afl-showmap.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/afl-showmap.c b/src/afl-showmap.c index ce1f8004..b1b548e5 100644 --- a/src/afl-showmap.c +++ b/src/afl-showmap.c @@ -864,19 +864,20 @@ static void usage(u8 *argv0) { "AFL_DEBUG: enable extra developer output\n" "AFL_FORKSRV_INIT_TMOUT: time spent waiting for forkserver during " "startup (in milliseconds)\n" - "AFL_KILL_SIGNAL: Signal ID delivered to child processes on timeout,\n" - " etc. (default: SIGKILL)\n" - "AFL_FORK_SERVER_KILL_SIGNAL: Signal delivered to fork server processes " - "on termination\n" - " (default: SIGTERM). If this is not set and " - "AFL_KILL_SIGNAL is set,\n" - " this will be set to the same value as " - "AFL_KILL_SIGNAL.\n" + "AFL_KILL_SIGNAL: Signal ID delivered to child processes on timeout, " + "etc.\n" + " (default: SIGKILL)\n" + "AFL_FORK_SERVER_KILL_SIGNAL: Kill signal for the fork server on " + "termination\n" + " (default: SIGTERM). If unset and " + "AFL_KILL_SIGNAL is\n" + " set, that value will be used.\n" "AFL_MAP_SIZE: the shared memory size for that target. must be >= the " - "size the target was compiled for\n" + "size the\n" + " target was compiled for\n" "AFL_PRELOAD: LD_PRELOAD / DYLD_INSERT_LIBRARIES settings for target\n" - "AFL_PRINT_FILENAMES: If set, the filename currently processed will be " - "printed to stdout\n" + "AFL_PRINT_FILENAMES: Print the queue entry currently processed will to " + "stdout\n" "AFL_QUIET: do not print extra informational output\n" "AFL_NO_FORKSRV: run target via execve instead of using the forkserver\n", argv0, doc_path); @@ -1264,7 +1265,9 @@ int main(int argc, char **argv_orig, char **envp) { : 0); be_quiet = save_be_quiet; - configure_afl_kill_signals(fsrv, NULL, NULL); + configure_afl_kill_signals( + fsrv, NULL, NULL, + (fsrv->qemu_mode || unicorn_mode) ? SIGKILL : SIGTERM); if (new_map_size) { |