diff options
| author | Jason Evans <jasone@canonware.com> | 2017-01-14 02:43:21 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2017-01-17 22:30:15 (GMT) |
| commit | 8115f05b2675d5449af686ddecc0ae5d5fd23fc2 (patch) | |
| tree | b744db1b73e06637e608d13d38abc808d65c9a4b /src/jemalloc_cpp.cpp | |
| parent | 41aa41853c1101c5e6f1b5759b830dff22e560df (diff) | |
| download | jemalloc-8115f05b2675d5449af686ddecc0ae5d5fd23fc2.zip jemalloc-8115f05b2675d5449af686ddecc0ae5d5fd23fc2.tar.gz jemalloc-8115f05b2675d5449af686ddecc0ae5d5fd23fc2.tar.bz2 | |
Add nullptr support to sized delete operators.
Diffstat (limited to 'src/jemalloc_cpp.cpp')
| -rw-r--r-- | src/jemalloc_cpp.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/jemalloc_cpp.cpp b/src/jemalloc_cpp.cpp index 5cecfdb..984c944 100644 --- a/src/jemalloc_cpp.cpp +++ b/src/jemalloc_cpp.cpp @@ -118,11 +118,17 @@ void operator delete[](void *ptr, const std::nothrow_t &) noexcept void operator delete(void *ptr, std::size_t size) noexcept { + if (unlikely(ptr == nullptr)) { + return; + } je_sdallocx(ptr, size, /*flags=*/0); } void operator delete[](void *ptr, std::size_t size) noexcept { + if (unlikely(ptr == nullptr)) { + return; + } je_sdallocx(ptr, size, /*flags=*/0); } |