diff options
| author | Khaled Yakdan <yakdan@code-intelligence.de> | 2019-08-01 14:22:48 +0200 |
|---|---|---|
| committer | Khaled Yakdan <yakdan@code-intelligence.de> | 2019-08-01 14:22:48 +0200 |
| commit | ebf2c8caa590468e1eafbc257e44dc30af82e5f8 (patch) | |
| tree | 2b277b9bde32b82c2cedf684869c96424baa005f /alloc-inl.h | |
| parent | a949b40d11956f34c51f4546412a73e0400d1ffc (diff) | |
| parent | 7ca22cd552ff21ac0ef7cc1ab5e6e71912752a58 (diff) | |
| download | afl++-ebf2c8caa590468e1eafbc257e44dc30af82e5f8.tar.gz | |
Merge remote-tracking branch 'github/master' into custom_mutator
# Conflicts:
# Makefile
# afl-fuzz.c
Diffstat (limited to 'alloc-inl.h')
| -rw-r--r-- | alloc-inl.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/alloc-inl.h b/alloc-inl.h index d3c125fb..04f56d0d 100644 --- a/alloc-inl.h +++ b/alloc-inl.h @@ -83,10 +83,22 @@ ABORT("Use after free."); \ else ABORT("Corrupted head alloc canary."); \ } \ + } \ + } while (0) + +/* +#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) +*/ #define CHECK_PTR_EXPR(_p) ({ \ typeof (_p) _tmp = (_p); \ |