diff options
| author | hexcoder- <heiko@hexco.de> | 2020-01-07 07:12:05 +0100 |
|---|---|---|
| committer | hexcoder- <heiko@hexco.de> | 2020-01-07 07:12:05 +0100 |
| commit | f88910755b280fdd8681dfcfff62d76a4fc416e5 (patch) | |
| tree | 320e534c6b347b9289eb0f43538f8ff132cf44d6 /src | |
| parent | d176c59ea28c3830dce2b7aa5ac404bbd769420b (diff) | |
| parent | b2bee5c32a4bd4d7b063f1189ac71a9658114f71 (diff) | |
| download | afl++-f88910755b280fdd8681dfcfff62d76a4fc416e5.tar.gz | |
Merge branch 'master' of https://github.com/vanhauser-thc/AFLplusplus
Diffstat (limited to 'src')
| -rw-r--r-- | src/afl-fuzz-one.c | 23 | ||||
| -rw-r--r-- | src/afl-fuzz.c | 7 | ||||
| -rw-r--r-- | src/afl-gotcpu.c | 2 |
3 files changed, 13 insertions, 19 deletions
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 4d1ac541..74123300 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -482,6 +482,8 @@ u8 fuzz_one_original(char** argv) { if (use_radamsa > 1) goto radamsa_stage; + // custom_stage: // not used - yet + if (custom_mutator) { stage_short = "custom"; @@ -541,13 +543,10 @@ u8 fuzz_one_original(char** argv) { : havoc_max_mult * 100)) || queue_cur->passed_det) { - if (use_radamsa > 1) - goto radamsa_stage; - else #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -557,13 +556,10 @@ u8 fuzz_one_original(char** argv) { if (master_max && (queue_cur->exec_cksum % master_max) != master_id - 1) { - if (use_radamsa > 1) - goto radamsa_stage; - else #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -2266,13 +2262,10 @@ retry_splicing: out_buf = ck_alloc_nozero(len); memcpy(out_buf, in_buf, len); - if (use_radamsa > 1) - goto radamsa_stage; - else #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index f3927d4e..0af8b35f 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - fuzzer code + american fuzzy lop++ - fuzzer code -------------------------------- Originally written by Michal Zalewski @@ -144,7 +144,8 @@ static void usage(u8* argv0) { argv0, EXEC_TIMEOUT, MEM_LIMIT); #ifdef USE_PYTHON - SAYF("Compiled with Python %s module support, see docs/python_mutators.txt\n", (char*)PYTHON_VERSION); + SAYF("Compiled with Python %s module support, see docs/python_mutators.txt\n", + (char*)PYTHON_VERSION); #endif SAYF("For additional help please consult %s/README.md\n\n", doc_path); @@ -591,7 +592,7 @@ int main(int argc, char** argv) { if (optind == argc || !in_dir || !out_dir) usage(argv[0]); OKF("afl++ is maintained by Marc \"van Hauser\" Heuse, Heiko \"hexcoder\" " - "Eissfeldt and Andrea Fioraldi"); + "Eißfeldt and Andrea Fioraldi"); OKF("afl++ is open source, get it at " "https://github.com/vanhauser-thc/AFLplusplus"); OKF("Power schedules from github.com/mboehme/aflfast"); diff --git a/src/afl-gotcpu.c b/src/afl-gotcpu.c index 21785a9e..9a56159c 100644 --- a/src/afl-gotcpu.c +++ b/src/afl-gotcpu.c @@ -1,5 +1,5 @@ /* - american fuzzy lop - free CPU gizmo + american fuzzy lop++ - free CPU gizmo ----------------------------------- Originally written by Michal Zalewski |