Consider using the latest AFLplusplus #3
Description
The release code using AFLplusplus 2.65c, which is a bit old. Now the latest AFLplusplus version is 3.14c. I want to replace the 2.65c version with the latest 3.14c version. Is it OK to patch the differences that diff shows? Any suggestions for me? Thanks a lot.
The diff tool shows that:
$ diff -ru AFLplusplus AFLplusplus-2.65c/
diff -ru AFLplusplus/llvm_mode/afl-clang-fast.c AFLplusplus-2.65c/llvm_mode/afl-clang-fast.c
--- AFLplusplus/llvm_mode/afl-clang-fast.c 2021-11-19 08:31:53.637050904 +0800
+++ AFLplusplus-2.65c/llvm_mode/afl-clang-fast.c 2020-05-15 14:36:51.000000000 +0800
@@ -584,11 +584,9 @@
be_quiet = 1;
- instrument_mode = INSTRUMENT_DEFAULT;
-
-/*#ifdef USE_TRACE_PC
+#ifdef USE_TRACE_PC
instrument_mode = INSTRUMENT_PCGUARD;
-#endif*/
+#endif
if (getenv("USE_TRACE_PC") || getenv("AFL_USE_TRACE_PC") ||
getenv("AFL_LLVM_USE_TRACE_PC") || getenv("AFL_TRACE_PC")) {
diff -ru AFLplusplus/llvm_mode/afl-llvm-pass.so.cc AFLplusplus-2.65c/llvm_mode/afl-llvm-pass.so.cc
--- AFLplusplus/llvm_mode/afl-llvm-pass.so.cc 2021-11-19 08:31:53.637050904 +0800
+++ AFLplusplus-2.65c/llvm_mode/afl-llvm-pass.so.cc 2020-05-15 14:36:51.000000000 +0800
@@ -266,12 +266,7 @@
AFLPrevLoc = new GlobalVariable(
M, Int32Ty, false, GlobalValue::ExternalLinkage, 0, "__afl_prev_loc");
#else
- //AFLPrevLoc = new GlobalVariable(
- // M, Int32Ty, false, GlobalValue::ExternalLinkage, 0, "__afl_prev_loc", 0,
- // GlobalVariable::GeneralDynamicTLSModel, 0, false);
- AFLPrevLoc = M.getGlobalVariable("__afl_prev_loc");
- if (AFLPrevLoc == nullptr)
- AFLPrevLoc = new GlobalVariable(
+ AFLPrevLoc = new GlobalVariable(
M, Int32Ty, false, GlobalValue::ExternalLinkage, 0, "__afl_prev_loc", 0,
GlobalVariable::GeneralDynamicTLSModel, 0, false);
#endif
diff -ru AFLplusplus/src/afl-common.c AFLplusplus-2.65c/src/afl-common.c
--- AFLplusplus/src/afl-common.c 2021-11-19 15:01:11.153806707 +0800
+++ AFLplusplus-2.65c/src/afl-common.c 2020-05-15 14:36:51.000000000 +0800
@@ -884,6 +884,7 @@
timeout.tv_sec = (timeout_ms / 1000);
timeout.tv_usec = (timeout_ms % 1000) * 1000;
+ size_t read_total = 0;
size_t len_read = 0;
while (len_read < len) {
@@ -906,6 +907,7 @@
len_read = read(fd, ((u8 *)buf) + len_read, len - len_read);
if (!len_read) { return 0; }
+ read_total += len_read;
}
diff -ru AFLplusplus/src/afl-fuzz-one.c AFLplusplus-2.65c/src/afl-fuzz-one.c
--- AFLplusplus/src/afl-fuzz-one.c 2021-11-19 08:31:53.641050896 +0800
+++ AFLplusplus-2.65c/src/afl-fuzz-one.c 2020-05-15 14:36:51.000000000 +0800
@@ -488,8 +488,6 @@
if (afl->queue_cur->cal_failed < CAL_CHANCES) {
- afl->queue_cur->exec_cksum = 0;
-
res =
calibrate_case(afl, afl->queue_cur, in_buf, afl->queue_cycle - 1, 0);
@@ -2638,8 +2636,6 @@
if (afl->queue_cur->cal_failed < CAL_CHANCES) {
- afl->queue_cur->exec_cksum = 0;
-
res =
calibrate_case(afl, afl->queue_cur, in_buf, afl->queue_cycle - 1, 0);