diff options
| -rw-r--r-- | custom_mutators/libfuzzer/FuzzerExtFunctionsWeak.cpp | 2 | ||||
| -rw-r--r-- | custom_mutators/libfuzzer/FuzzerExtFunctionsWindows.cpp | 4 | ||||
| -rw-r--r-- | instrumentation/afl-gcc-pass.so.cc | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/custom_mutators/libfuzzer/FuzzerExtFunctionsWeak.cpp b/custom_mutators/libfuzzer/FuzzerExtFunctionsWeak.cpp index bbd8f3ba..caf1a7ef 100644 --- a/custom_mutators/libfuzzer/FuzzerExtFunctionsWeak.cpp +++ b/custom_mutators/libfuzzer/FuzzerExtFunctionsWeak.cpp @@ -48,7 +48,7 @@ ExternalFunctions::ExternalFunctions() { \ #define EXT_FUNC(NAME, RETURN_TYPE, FUNC_SIG, WARN) this->NAME = ::NAME; CheckFnPtr(reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(::NAME)), - #NAME, WARN); + #NAME, WARN); #include "FuzzerExtFunctions.def" diff --git a/custom_mutators/libfuzzer/FuzzerExtFunctionsWindows.cpp b/custom_mutators/libfuzzer/FuzzerExtFunctionsWindows.cpp index d79421cd..630f352d 100644 --- a/custom_mutators/libfuzzer/FuzzerExtFunctionsWindows.cpp +++ b/custom_mutators/libfuzzer/FuzzerExtFunctionsWindows.cpp @@ -46,8 +46,8 @@ using namespace fuzzer; extern "C" { -#define EXT_FUNC(NAME, RETURN_TYPE, FUNC_SIG, WARN) - RETURN_TYPE NAME##Def FUNC_SIG { + #define EXT_FUNC(NAME, RETURN_TYPE, FUNC_SIG, WARN) +RETURN_TYPE NAME##Def FUNC_SIG { Printf("ERROR: Function \"%s\" not defined.\n", #NAME); exit(1); diff --git a/instrumentation/afl-gcc-pass.so.cc b/instrumentation/afl-gcc-pass.so.cc index 52304832..04d606cc 100644 --- a/instrumentation/afl-gcc-pass.so.cc +++ b/instrumentation/afl-gcc-pass.so.cc @@ -159,8 +159,9 @@ #include <gimple-iterator.h> #include <stringpool.h> #include <gimple-ssa.h> -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 60200 /* >= version 6.2.0 */ -#include <tree-vrp.h> +#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= \ + 60200 /* >= version 6.2.0 */ + #include <tree-vrp.h> #endif #include <tree-ssanames.h> #include <tree-phinodes.h> @@ -334,12 +335,12 @@ struct afl_pass : gimple_opt_pass { gimple_seq_add_stmt(&seq, add1_cntr); /* Extract the real part into count. */ - tree cntrb = build1(REALPART_EXPR, TREE_TYPE(cntr), xaddc); + tree cntrb = build1(REALPART_EXPR, TREE_TYPE(cntr), xaddc); auto xtrct_cntr = gimple_build_assign(cntr, cntrb); gimple_seq_add_stmt(&seq, xtrct_cntr); /* Extract the imaginary part into xincr. */ - tree incrb = build1(IMAGPART_EXPR, TREE_TYPE(xincr), xaddc); + tree incrb = build1(IMAGPART_EXPR, TREE_TYPE(xincr), xaddc); auto xtrct_xincr = gimple_build_assign(xincr, incrb); gimple_seq_add_stmt(&seq, xtrct_xincr); |