ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-07 15:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

alloc-inl.h/ck_maybe_grow(): restore original exponential allocs

Browse Source
This commit is contained in:
hexcoder- 2020-03-28 12:15:01 +01:00 committed by Dominik Maier
parent 1119a2e185
commit f370ef38c4
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/alloc-inl.h
View File

@ -767,6 +767,20 @@ static inline void TRK_ck_free(void *ptr, const char *file, const char *func,
#endif /* _WANT_ORIGINAL_AFL_ALLOC */ #endif /* _WANT_ORIGINAL_AFL_ALLOC */
/* This function calculates the lowest power of 2 greater or equal its argument.
@return The rounded up power of 2 (if no overflow) or 0 on overflow.
*/
static inline size_t powerOf2Ceil(size_t in) {
if (in == 0 || in > (size_t)-1) return 0; /* avoid undefined behaviour under-/overflow */
size_t out = in - 1;
out |= out >> 1;
out |= out >> 2;
out |= out >> 4;
out |= out >> 8;
out |= out >> 16;
return out + 1;
}
/* This function makes sure *size is > size_needed after call. /* This function makes sure *size is > size_needed after call.
It will realloc *buf otherwise. It will realloc *buf otherwise.
*size will grow exponentially as per: *size will grow exponentially as per:
@ -784,16 +798,19 @@ static inline void *ck_maybe_grow(void **buf, size_t *size,
if (likely(*size >= size_needed)) return *buf; if (likely(*size >= size_needed)) return *buf;
/* No initial size was set */ /* No initial size was set */
if (*size == 0) *size = INITIAL_GROWTH_SIZE; if (size_needed < INITIAL_GROWTH_SIZE) size_needed = INITIAL_GROWTH_SIZE;
while (*size < size_needed) {
/* in case of overflow we'll realloc to size_needed */ /* grow exponentially */
if (2*(*size) < size_needed) *size = size_needed; size_t next_size = powerOf2Ceil(size_needed);
else *size *= 2;
/* handle overflow */
if (!next_size) {
next_size = size_needed;
} }
*buf = ck_realloc(*buf, *size); /* alloc */
*buf = ck_realloc(*buf, next_size);
*size = next_size;
return *buf; return *buf;