ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-13 02:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix error handling in fauxserver

Browse Source
This commit is contained in:
hexcoder-
2020-11-14 19:38:06 +01:00
parent 40e10895a2
commit 76c5b8a3b4
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/afl-forkserver.c
View File

@ -220,15 +220,7 @@ static void afl_fauxsrv_execv(afl_forkserver_t *fsrv, char **argv) {
} }
void (*old_sigchld_handler)(int) = signal(SIGCHLD, SIG_DFL); void (*old_sigchld_handler)(int) = signal(SIGCHLD, SIG_DFL);
#if 0
WARNF("targetpath=%s", fsrv->target_path);
if (argv) {
for (char *p = argv[0]; p; ++p) {
WARNF(" %s", p);
}
}
WARNF("\n");
#endif
while (1) { while (1) {
uint32_t was_killed; uint32_t was_killed;
@ -1146,7 +1138,7 @@ fsrv_run_result_t afl_fsrv_run_target(afl_forkserver_t *fsrv, u32 timeout,
} }
// Fauxserver should handle this now. // Fauxserver should handle this now.
// if (tb4 == EXEC_FAIL_SIG) return FSRV_RUN_ERROR; if (*(u32 *)fsrv->trace_bits == EXEC_FAIL_SIG) return FSRV_RUN_ERROR;
return FSRV_RUN_OK; return FSRV_RUN_OK;

4
src/afl-fuzz.c
View File

@ -442,7 +442,7 @@ int main(int argc, char **argv_orig, char **envp) {
if (optarg && *optarg == '-') { FATAL("argument for -M started with a dash '-', which is used for options"); } if (optarg && *optarg == '-') { FATAL("argument for -M started with a dash '-', which is used for options"); }
afl->sync_id = ck_strdup(optarg); afl->sync_id = ck_strdup(optarg);
afl->skip_deterministic = 0; // force determinsitic fuzzing afl->skip_deterministic = 0; // force deterministic fuzzing
afl->old_seed_selection = 1; // force old queue walking seed selection afl->old_seed_selection = 1; // force old queue walking seed selection
if ((c = strchr(afl->sync_id, ':'))) { if ((c = strchr(afl->sync_id, ':'))) {
@ -922,7 +922,7 @@ int main(int argc, char **argv_orig, char **envp) {
afl->power_name = power_names[afl->schedule]; afl->power_name = power_names[afl->schedule];
if (!afl->sync_id) { if (!afl->non_instrumented_mode && !afl->sync_id) {
auto_sync = 1; auto_sync = 1;
afl->sync_id = ck_strdup("default"); afl->sync_id = ck_strdup("default");