diff options
| author | van Hauser <vh@thc.org> | 2021-01-08 15:43:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 15:43:13 +0100 |
| commit | 20a47cb23e9c6406b4a6c0c94783667a8b06316a (patch) | |
| tree | 1aeeb9555be23bb55b888e134e5ca50929387236 /src/afl-tmin.c | |
| parent | 7b8c8cf12fde0feab25a1d794e010a5778cf9be8 (diff) | |
| parent | 813627cbd32be9466e0b5ad3a83ce8209dcfeb51 (diff) | |
| download | afl++-20a47cb23e9c6406b4a6c0c94783667a8b06316a.tar.gz | |
Merge pull request #679 from AFLplusplus/dev
Dev
Diffstat (limited to 'src/afl-tmin.c')
| -rw-r--r-- | src/afl-tmin.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/afl-tmin.c b/src/afl-tmin.c index ed928c7c..6e2d7708 100644 --- a/src/afl-tmin.c +++ b/src/afl-tmin.c @@ -835,8 +835,8 @@ static void usage(u8 *argv0) { "Execution control settings:\n" " -f file - input file read by the tested program (stdin)\n" - " -t msec - timeout for each run (%d ms)\n" - " -m megs - memory limit for child process (%d MB)\n" + " -t msec - timeout for each run (%u ms)\n" + " -m megs - memory limit for child process (%u MB)\n" " -Q - use binary-only instrumentation (QEMU mode)\n" " -U - use unicorn-based instrumentation (Unicorn mode)\n" " -W - use qemu-based instrumentation with Wine (Wine " @@ -855,6 +855,7 @@ static void usage(u8 *argv0) { "Environment variables used:\n" "AFL_CRASH_EXITCODE: optional child exit code to be interpreted as crash\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_MAP_SIZE: the shared memory size for that target. must be >= the size\n" " the target was compiled for\n" "AFL_PRELOAD: LD_PRELOAD / DYLD_INSERT_LIBRARIES settings for target\n" @@ -1134,6 +1135,9 @@ int main(int argc, char **argv_orig, char **envp) { } + fsrv->kill_signal = + parse_afl_kill_signal_env(getenv("AFL_KILL_SIGNAL"), SIGKILL); + if (getenv("AFL_CRASH_EXITCODE")) { long exitcode = strtol(getenv("AFL_CRASH_EXITCODE"), NULL, 10); |