diff options
| author | David CARLIER <devnexen@gmail.com> | 2020-12-31 11:35:32 +0000 |
|---|---|---|
| committer | David CARLIER <devnexen@gmail.com> | 2020-12-31 11:38:35 +0000 |
| commit | 935724557f1c9ee59141c7fc4b27c3831ad52435 (patch) | |
| tree | bd8a29d58ccb3b0507ce60f4ca53efe1838ae36b /utils | |
| parent | 7e6645d5a25b874b978430eeb7d1ddce1f681d98 (diff) | |
| download | AFLplusplus-935724557f1c9ee59141c7fc4b27c3831ad52435.tar.gz | |
libdislocator, ptr algo warning fix on clang/Xcode (m1).
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/libdislocator/libdislocator.so.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/utils/libdislocator/libdislocator.so.c b/utils/libdislocator/libdislocator.so.c index 2324e390..c2b200cb 100644 --- a/utils/libdislocator/libdislocator.so.c +++ b/utils/libdislocator/libdislocator.so.c @@ -345,10 +345,10 @@ void free(void *ptr) { len = PTR_L(ptr); total_mem -= len; + u8 * ptr_ = ptr; if (align_allocations && (len & (ALLOC_ALIGN_SIZE - 1))) { - u8 * ptr_ = ptr; size_t rlen = (len & ~(ALLOC_ALIGN_SIZE - 1)) + ALLOC_ALIGN_SIZE; for (; len < rlen; ++len) if (ptr_[len] != TAIL_ALLOC_CANARY) @@ -359,11 +359,13 @@ void free(void *ptr) { /* Protect everything. Note that the extra page at the end is already set as PROT_NONE, so we don't need to touch that. */ - ptr -= PAGE_SIZE * PG_COUNT(len + 8) - len - 8; + ptr_ -= PAGE_SIZE * PG_COUNT(len + 8) - len - 8; - if (mprotect(ptr - 8, PG_COUNT(len + 8) * PAGE_SIZE, PROT_NONE)) + if (mprotect(ptr_ - 8, PG_COUNT(len + 8) * PAGE_SIZE, PROT_NONE)) FATAL("mprotect() failed when freeing memory"); + ptr = ptr_; + /* Keep the mapping; this is wasteful, but prevents ptr reuse. */ } |