diff --git a/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp b/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp index 50e0f096ba..5cdf228d30 100644 --- a/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp +++ b/Userland/Libraries/LibJS/Heap/BlockAllocator.cpp @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include @@ -11,6 +12,10 @@ #include #include +#ifdef HAS_ADDRESS_SANITIZER +# include +#endif + namespace JS { BlockAllocator::BlockAllocator() @@ -20,6 +25,7 @@ BlockAllocator::BlockAllocator() BlockAllocator::~BlockAllocator() { for (auto* block : m_blocks) { + ASAN_UNPOISON_MEMORY_REGION(block, HeapBlock::block_size); #ifdef __serenity__ if (munmap(block, HeapBlock::block_size) < 0) { perror("munmap"); @@ -35,6 +41,7 @@ void* BlockAllocator::allocate_block([[maybe_unused]] char const* name) { if (!m_blocks.is_empty()) { auto* block = m_blocks.take_last(); + ASAN_UNPOISON_MEMORY_REGION(block, HeapBlock::block_size); #ifdef __serenity__ if (set_mmap_name(block, HeapBlock::block_size, name) < 0) { perror("set_mmap_name"); @@ -69,6 +76,7 @@ void BlockAllocator::deallocate_block(void* block) return; } + ASAN_POISON_MEMORY_REGION(block, HeapBlock::block_size); m_blocks.append(block); }