RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 01:48:11 +00:00
Code Issues Activity Actions

Kernel: Allow passing null pointer to delete

Browse source 
The C++ standard says that it's legal to call the `delete` operator with
a null pointer argument, in which case it should be a no-op. I
encountered this issue when running a kernel that's compiled with Clang.
I assume this fact was used for some kind of optimization.
This commit is contained in:
Daniel Bertalan 2021-07-12 19:17:41 +02:00 • committed by Andreas Kling
parent bb26cea291
commit b847541ee8
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Heap/SlabAllocator.h
View file

@ -33,6 +33,8 @@ public: \
} \ } \
void operator delete(void* ptr) noexcept \ void operator delete(void* ptr) noexcept \
{ \ { \
if (!ptr) \
return; \
slab_dealloc(ptr, sizeof(type)); \ slab_dealloc(ptr, sizeof(type)); \
} \ } \
\ \

2
Kernel/KString.cpp
View file

@ -59,6 +59,8 @@ OwnPtr<KString> KString::try_clone() const
void KString::operator delete(void* string) void KString::operator delete(void* string)
{ {
if (!string)
return;
size_t allocation_size = sizeof(KString) + (sizeof(char) * static_cast<KString*>(string)->m_length) + sizeof(char); size_t allocation_size = sizeof(KString) + (sizeof(char) * static_cast<KString*>(string)->m_length) + sizeof(char);
kfree_sized(string, allocation_size); kfree_sized(string, allocation_size);
} }