From b7b14ef19f28b2e29081cb7695800863ed53fbed Mon Sep 17 00:00:00 2001 From: malavan Date: Thu, 21 Oct 2021 23:50:50 +0000 Subject: [PATCH] null check for delete override Former-commit-id: a48b4cbdf24bfa5a1d13295c0202d1ed09115374 --- src/new.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/new.cpp b/src/new.cpp index 4775e207a..4e6b07dfd 100644 --- a/src/new.cpp +++ b/src/new.cpp @@ -27,14 +27,17 @@ void *operator new(std::size_t size, const std::nothrow_t &) noexcept return zmalloc(size, MALLOC_LOCAL); } +//need to do null checks for delete since the compiler can optimize out null checks in zfree void operator delete(void * p) noexcept { - zfree(p); + if (p != nullptr) + zfree(p); } void operator delete(void *p, std::size_t) noexcept { - zfree(p); + if (p != nullptr) + zfree(p); } #endif