refactored kill signal env parsing

This commit is contained in:
Dominik Maier
2021-01-08 11:36:40 +01:00
parent 7eaca9c840
commit 34732e3c5e
5 changed files with 47 additions and 82 deletions

View File

@ -1116,33 +1116,8 @@ int main(int argc, char **argv_orig, char **envp) {
}
fsrv->kill_signal = SIGKILL;
char *afl_kill_signal_env = getenv("AFL_KILL_SIGNAL");
if (afl_kill_signal_env && afl_kill_signal_env[0]) {
char *endptr;
u8 signal_code;
signal_code = (u8)strtoul(afl_kill_signal_env, &endptr, 10);
/* Did we manage to parse the full string? */
if (*endptr != '\0' || endptr == afl_kill_signal_env) {
FATAL("Invalid AFL_KILL_SIGNAL: %s (expected unsigned int)",
afl_kill_signal_env);
}
fsrv->kill_signal = signal_code;
} else {
char *sigstr = alloc_printf("%d", (int)SIGKILL);
if (!sigstr) { FATAL("Failed to alloc mem for signal buf"); }
/* Set the env for signal handler */
setenv("AFL_KILL_SIGNAL", sigstr, 1);
free(sigstr);
}
fsrv->kill_signal =
parse_afl_kill_signal_env(getenv("AFL_KILL_SIGNAL"), SIGKILL);
if (getenv("AFL_CRASH_EXITCODE")) {