From 710566be93debc87dadf28ce82cac51c177f9dbc Mon Sep 17 00:00:00 2001 From: van Hauser Date: Thu, 2 Jan 2020 10:51:14 +0100 Subject: remove unnecessary conditions --- src/afl-fuzz-one.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 4d1ac541..87a1418c 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -482,6 +482,9 @@ 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,9 +544,6 @@ 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; #else @@ -557,9 +557,6 @@ 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; #else @@ -2266,9 +2263,6 @@ 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; #else -- cgit v1.2.3 From 80705aca6154e7862c586edd43f69a282e3fd76c Mon Sep 17 00:00:00 2001 From: hexcoder Date: Fri, 3 Jan 2020 07:46:21 +0100 Subject: Typo in name --- src/afl-fuzz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index f3927d4e..5e9a4169 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -591,7 +591,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"); -- cgit v1.2.3 From 67cbeeb395c7e0aa8820e79c92f5e8e1322f8be0 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Mon, 6 Jan 2020 11:46:14 +0100 Subject: added ++ to copyright notes --- src/afl-fuzz.c | 2 +- src/afl-gotcpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index ebc11f01..59892559 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 diff --git a/src/afl-gotcpu.c b/src/afl-gotcpu.c index 0f53fbd6..da574ed8 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 -- cgit v1.2.3 From b2bee5c32a4bd4d7b063f1189ac71a9658114f71 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Mon, 6 Jan 2020 16:17:23 +0100 Subject: moar moar copyrights --- src/afl-fuzz-one.c | 15 +++++++-------- src/afl-fuzz.c | 3 ++- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 87a1418c..74123300 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -482,8 +482,7 @@ u8 fuzz_one_original(char** argv) { if (use_radamsa > 1) goto radamsa_stage; - -//custom_stage: // not used - yet + // custom_stage: // not used - yet if (custom_mutator) { @@ -545,9 +544,9 @@ u8 fuzz_one_original(char** argv) { queue_cur->passed_det) { #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -558,9 +557,9 @@ u8 fuzz_one_original(char** argv) { if (master_max && (queue_cur->exec_cksum % master_max) != master_id - 1) { #ifdef USE_PYTHON - goto python_stage; + goto python_stage; #else - goto havoc_stage; + goto havoc_stage; #endif } @@ -2264,9 +2263,9 @@ retry_splicing: memcpy(out_buf, in_buf, len); #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 e75ab48a..0af8b35f 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -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); -- cgit v1.2.3