aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-05-27 11:28:29 +0200
committervan Hauser <vh@thc.org>2020-05-27 11:28:29 +0200
commitaace0d119228aeb847e97f9dae50b8e0738eed90 (patch)
tree1054668af0034b718388a68bcbe16a239c7f7b06
parentcee4b4593bd8efe5952eea8aef04bcfafeb48d3f (diff)
downloadafl++-aace0d119228aeb847e97f9dae50b8e0738eed90.tar.gz
code format
-rw-r--r--docs/Changelog.md1
-rw-r--r--docs/INSTALL.md4
-rw-r--r--src/afl-fuzz-one.c26
3 files changed, 17 insertions, 14 deletions
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 18acfba4..d95f7367 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -16,6 +16,7 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
exactly one master is present and warn otherwise
- If no master is present at a sync one slave automatically becomes
a temporary master until a real master shows up
+ - fix/update to MOpt (thanks to arnow117)
- llvm_mode:
- the default instrumentation is now PCGUARD, as it is faster and provides
better coverage. The original afl instrumentation can be set via
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 0f9673ad..766f24d7 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -17,7 +17,7 @@ You can start using the fuzzer without installation, but it is also possible to
install it with:
```bash
-make install
+sudo make install
```
There are no special dependencies to speak of; you will need GNU make and a
@@ -46,7 +46,7 @@ please install it first. As on Linux, you can use the fuzzer itself without
installation, or install it with:
```
-gmake install
+sudo gmake install
```
Keep in mind that if you are using csh as your shell, the syntax of some of the
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c
index 5b1a2cba..56f16b4c 100644
--- a/src/afl-fuzz-one.c
+++ b/src/afl-fuzz-one.c
@@ -4251,7 +4251,7 @@ pacemaker_fuzzing:
afl->queued_paths + afl->unique_crashes - temp_total_found;
afl->total_puppet_find = afl->total_puppet_find + temp_temp_puppet;
- if (MOpt_globals.is_pilot_mode){
+ if (MOpt_globals.is_pilot_mode) {
for (i = 0; i < operator_num; ++i) {
@@ -4265,13 +4265,14 @@ pacemaker_fuzzing:
} else {
- for (i = 0; i < operator_num; i++) {
+ for (i = 0; i < operator_num; i++) {
- if (afl->core_operator_cycles_puppet_v2[i] > afl->core_operator_cycles_puppet_v3[i])
+ if (afl->core_operator_cycles_puppet_v2[i] >
+ afl->core_operator_cycles_puppet_v3[i])
- afl->core_operator_finds_puppet_v2[i] += temp_temp_puppet;
+ afl->core_operator_finds_puppet_v2[i] += temp_temp_puppet;
- }
+ }
}
@@ -4545,14 +4546,15 @@ pacemaker_fuzzing:
} else {
- for (i = 0; i < operator_num; i++)
- {
+ for (i = 0; i < operator_num; i++) {
- afl->core_operator_finds_puppet[i] = afl->core_operator_finds_puppet_v2[i];
- afl->core_operator_cycles_puppet[i] = afl->core_operator_cycles_puppet_v2[i];
- temp_stage_finds_puppet += afl->core_operator_finds_puppet[i];
-
- }
+ afl->core_operator_finds_puppet[i] =
+ afl->core_operator_finds_puppet_v2[i];
+ afl->core_operator_cycles_puppet[i] =
+ afl->core_operator_cycles_puppet_v2[i];
+ temp_stage_finds_puppet += afl->core_operator_finds_puppet[i];
+
+ }
afl->key_module = 2;