code-format and slight -S/-M modifications

This commit is contained in:
van Hauser
2020-05-13 16:49:00 +02:00
parent c384a17b41
commit 60a5df5262
7 changed files with 46 additions and 39 deletions

View File

@ -390,7 +390,7 @@ int main(int argc, char **argv_orig, char **envp) {
}
afl->force_deterministic = 1;
afl->is_master = 1;
}
@ -400,6 +400,9 @@ int main(int argc, char **argv_orig, char **envp) {
if (afl->sync_id) { FATAL("Multiple -S or -M options not supported"); }
afl->sync_id = ck_strdup(optarg);
afl->is_slave = 1;
afl->skip_deterministic = 1;
afl->use_splicing = 1;
break;
case 'f': /* target file */
@ -500,12 +503,6 @@ int main(int argc, char **argv_orig, char **envp) {
case 'd': /* skip deterministic */
if (afl->skip_deterministic) {
FATAL("Multiple -d options not supported");
}
afl->skip_deterministic = 1;
afl->use_splicing = 1;
break;
@ -794,8 +791,7 @@ int main(int argc, char **argv_orig, char **envp) {
OKF("afl-tmin fork server patch from github.com/nccgroup/TriforceAFL");
OKF("MOpt Mutator from github.com/puppet-meteor/MOpt-AFL");
if (afl->sync_id && afl->force_deterministic &&
afl->afl_env.afl_custom_mutator_only) {
if (afl->sync_id && afl->is_master && afl->afl_env.afl_custom_mutator_only) {
WARNF(
"Using -M master with the AFL_CUSTOM_MUTATOR_ONLY mutator options will "