diff options
| author | van Hauser <vh@thc.org> | 2022-10-24 20:01:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-24 20:01:36 +0200 |
| commit | 02502c1a543b2150bec78fbac2f0fcf1f4cd7a5a (patch) | |
| tree | 690fe65fc6663cbd80711f89882d67643210692d /src/afl-showmap.c | |
| parent | e9ecfed81dfd57f557a0e91d4f8ac106cfe867a2 (diff) | |
| parent | 2cbe49c6eb9fa3514289a088e68c847949d9d4cc (diff) | |
| download | afl++-02502c1a543b2150bec78fbac2f0fcf1f4cd7a5a.tar.gz | |
Merge pull request #1563 from nbars/stable
Fix child reaping on fuzzer termination
Diffstat (limited to 'src/afl-showmap.c')
| -rw-r--r-- | src/afl-showmap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/afl-showmap.c b/src/afl-showmap.c index 5e3fb67d..31091e8e 100644 --- a/src/afl-showmap.c +++ b/src/afl-showmap.c @@ -129,7 +129,7 @@ static void kill_child() { timed_out = 1; if (fsrv->child_pid > 0) { - kill(fsrv->child_pid, fsrv->kill_signal); + kill(fsrv->child_pid, fsrv->child_kill_signal); fsrv->child_pid = -1; } @@ -864,8 +864,11 @@ 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, " - "etc. (default: SIGKILL)\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_MAP_SIZE: the shared memory size for that target. must be >= the " "size the target was compiled for\n" "AFL_PRELOAD: LD_PRELOAD / DYLD_INSERT_LIBRARIES settings for target\n" @@ -1258,8 +1261,7 @@ int main(int argc, char **argv_orig, char **envp) { : 0); be_quiet = save_be_quiet; - fsrv->kill_signal = - parse_afl_kill_signal_env(getenv("AFL_KILL_SIGNAL"), SIGKILL); + configure_afl_kill_signals(fsrv, NULL, NULL); if (new_map_size) { @@ -1472,4 +1474,3 @@ int main(int argc, char **argv_orig, char **envp) { exit(ret); } - |