diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2019-09-13 11:37:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 11:37:26 +0200 |
| commit | 8ee11fecc475dd6bcaab7f1e5a38c1cfac4c7e56 (patch) | |
| tree | f728ee952e94bb299bd5fc603009fbcd51dd85cb /include | |
| parent | a67d86c6e2ca58db81f2ddf6d0a4c837be88271d (diff) | |
| parent | 36020c41df88ae863fbc2a148765f9c61c7f8bf8 (diff) | |
| download | afl++-8ee11fecc475dd6bcaab7f1e5a38c1cfac4c7e56.tar.gz | |
Merge pull request #57 from vanhauser-thc/persistent_qemu
Persistent mode in QEMU
Diffstat (limited to 'include')
| -rw-r--r-- | include/alloc-inl.h | 29 | ||||
| -rw-r--r-- | include/config.h | 6 |
2 files changed, 8 insertions, 27 deletions
diff --git a/include/alloc-inl.h b/include/alloc-inl.h index d851fd61..b0815ab1 100644 --- a/include/alloc-inl.h +++ b/include/alloc-inl.h @@ -106,39 +106,20 @@ \ } while (0) -/* -#define CHECK_PTR(_p) do { \ - \ - \ - \ - \ +/* #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) */ diff --git a/include/config.h b/include/config.h index 98eb0a38..f2732ad4 100644 --- a/include/config.h +++ b/include/config.h @@ -373,9 +373,9 @@ /* for *BSD: use ARC4RANDOM and save a file descriptor */ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #ifndef HAVE_ARC4RANDOM - #define HAVE_ARC4RANDOM 1 - #endif +#ifndef HAVE_ARC4RANDOM +#define HAVE_ARC4RANDOM 1 +#endif #endif /* __APPLE__ || __FreeBSD__ || __OpenBSD__ */ #endif /* ! _HAVE_CONFIG_H */ |