diff options
| author | van Hauser <vh@thc.org> | 2020-05-12 11:04:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 11:04:18 +0200 |
| commit | 1317433a51a7f7336c82c80a592835ddda9ef60f (patch) | |
| tree | e623506f1d0a8771c3fc266eed0a75b626a88724 /include/alloc-inl.h | |
| parent | bdd2a412c476cbd5aea0fff67ef096305815953b (diff) | |
| parent | a578d719e1f556db07ca3c7e2fe38b7668c204d8 (diff) | |
| download | afl++-1317433a51a7f7336c82c80a592835ddda9ef60f.tar.gz | |
Merge pull request #359 from AFLplusplus/dev
push to master
Diffstat (limited to 'include/alloc-inl.h')
| -rw-r--r-- | include/alloc-inl.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/alloc-inl.h b/include/alloc-inl.h index e5547fe0..485446de 100644 --- a/include/alloc-inl.h +++ b/include/alloc-inl.h @@ -214,8 +214,8 @@ static inline u8 *DFL_ck_memdup_str(u8 *mem, u32 size) { } -/* In non-debug mode, we just do straightforward aliasing of the above functions - to user-visible names such as ck_alloc(). */ +/* In non-debug mode, we just do straightforward aliasing of the above + functions to user-visible names such as ck_alloc(). */ #define ck_alloc DFL_ck_alloc #define ck_alloc_nozero DFL_ck_alloc_nozero @@ -247,7 +247,6 @@ static inline u8 *DFL_ck_memdup_str(u8 *mem, u32 size) { /* Macro to enforce allocation limits as a last-resort defense against integer overflows. */ - #define ALLOC_CHECK_SIZE(_s) \ do { \ \ @@ -358,7 +357,6 @@ static inline void DFL_ck_free(void *mem) { if (!mem) return; CHECK_PTR(mem); - #ifdef DEBUG_BUILD /* Catch pointer issues sooner. */ @@ -542,8 +540,8 @@ static inline u8 *DFL_ck_memdup_str(u8 *mem, u32 size) { #ifndef DEBUG_BUILD -/* In non-debug mode, we just do straightforward aliasing of the above functions - to user-visible names such as ck_alloc(). */ +/* In non-debug mode, we just do straightforward aliasing of the above + functions to user-visible names such as ck_alloc(). */ #define ck_alloc DFL_ck_alloc #define ck_alloc_nozero DFL_ck_alloc_nozero @@ -558,8 +556,8 @@ static inline u8 *DFL_ck_memdup_str(u8 *mem, u32 size) { #else -/* In debugging mode, we also track allocations to detect memory leaks, and the - flow goes through one more layer of indirection. */ +/* In debugging mode, we also track allocations to detect memory leaks, and + the flow goes through one more layer of indirection. */ /* Alloc tracking data structures: */ |