system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Prevent accidental misuse of BumpAllocator

Browse source 
In particular, we implicitly required that the caller initializes the
returned instances themselves (solved by making
UniformBumpAllocator::allocate call the constructor), and BumpAllocator
itself cannot handle classes that are not trivially deconstructible
(solved by deleting the method).

Co-authored-by: Ali Mohammad Pur <ali.mpfard@gmail.com>
This commit is contained in:
Ben Wiederhake 2021-10-22 20:15:47 +02:00 committed by Linus Groh
parent 5d865d574a
commit 50698a0db4
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
AK/BumpAllocator.h
View file

@ -51,12 +51,6 @@ public:
return (void*)aligned_ptr;
}
template<typename T>
T* allocate()
{
return (T*)allocate(sizeof(T), alignof(T));
}
void deallocate_all()
{
if (!m_head_chunk)
@ -160,9 +154,13 @@ public:
destroy_all();
}
T* allocate()
template<typename... Args>
T* allocate(Args&&... args)
{
return Allocator::template allocate<T>();
auto ptr = (T*)Allocator::allocate(sizeof(T), alignof(T));
if (!ptr)
return nullptr;
return new (ptr) T { forward<Args>(args)... };
}
void deallocate_all()

9
Userland/Libraries/LibRegex/RegexMatcher.cpp
View file

@ -333,13 +333,12 @@ public:
ALWAYS_INLINE void append(T value)
{
auto new_node = m_allocator.allocate();
VERIFY(new_node);
auto node_ptr = new (new_node) Node { move(value), nullptr, nullptr };
auto node_ptr = m_allocator.allocate(move(value));
VERIFY(node_ptr);
if (!m_first) {
m_first = new_node;
m_last = new_node;
m_first = node_ptr;
m_last = node_ptr;
return;
}