aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrea Fioraldi <andreafioraldi@gmail.com>2019-09-02 18:53:43 +0200
committerAndrea Fioraldi <andreafioraldi@gmail.com>2019-09-02 18:53:43 +0200
commitd47ef88fcd842bd13923b1b519544fa2c8d6d0eb (patch)
tree12a6349c143ae1b0de1215d688344ea9e0727ce1 /include
parentb24639d0113e15933e749ea0f96abe3f25a134a0 (diff)
downloadafl++-d47ef88fcd842bd13923b1b519544fa2c8d6d0eb.tar.gz
minor fixes
Diffstat (limited to 'include')
-rw-r--r--include/afl-fuzz.h14
-rw-r--r--include/alloc-inl.h6
2 files changed, 13 insertions, 7 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 3e121851..b5c5afaf 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -237,8 +237,8 @@ extern u8 *in_dir, /* Input directory with test cases */
*use_banner, /* Display banner */
*in_bitmap, /* Input bitmap */
*file_extension, /* File extension */
- *orig_cmdline; /* Original command line */
-extern u8 *doc_path, /* Path to documentation dir */
+ *orig_cmdline, /* Original command line */
+ *doc_path, /* Path to documentation dir */
*target_path, /* Path to target binary */
*out_file; /* File to fuzz, if any */
@@ -532,11 +532,11 @@ u8 common_fuzz_stuff(char**, u8*, u32);
/* Fuzz one */
-u8 fuzz_one_original(char**);
-static u8 pilot_fuzzing(char**);
-u8 core_fuzzing(char**);
-void pso_updating(void);
-u8 fuzz_one(char**);
+u8 fuzz_one_original(char**);
+u8 pilot_fuzzing(char**);
+u8 core_fuzzing(char**);
+void pso_updating(void);
+u8 fuzz_one(char**);
/* Init */
diff --git a/include/alloc-inl.h b/include/alloc-inl.h
index 4a4beff1..302d15b6 100644
--- a/include/alloc-inl.h
+++ b/include/alloc-inl.h
@@ -104,20 +104,26 @@
/*
#define CHECK_PTR(_p) do { \
\
+ \
if (_p) { \
\
+ \
if (ALLOC_C1(_p) ^ ALLOC_MAGIC_C1) {\
\
+ \
if (ALLOC_C1(_p) == ALLOC_MAGIC_F) \
ABORT("Use after free."); \
else ABORT("Corrupted head alloc canary."); \
\
} \
+ \
if (ALLOC_C2(_p) ^ ALLOC_MAGIC_C2) \
ABORT("Corrupted tail alloc canary."); \
\
} \
\
+ \
+ \
} while (0)
*/