diff options
| author | Louis Dionne <ldionne@apple.com> | 2018-09-25 04:13:08 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2018-09-25 04:13:08 +0000 |
| commit | c4b44869daab09da2f559e88c5efb137a65b3dbf (patch) | |
| tree | 24d4c5b22aca9f35ea59402c2011291c8c194943 /src | |
| parent | 32e3054763a5be1c180c5f6e4439940b003bc06c (diff) | |
| download | libcxx-c4b44869daab09da2f559e88c5efb137a65b3dbf.tar.gz | |
Revert r342936 "Remove redundant null pointer check in operator delete"
A review for the change was opened in https://reviews.llvm.org/D52401
but the change was committed before being approved by any of the code
owners for libc++.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@342938 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
| -rw-r--r-- | src/new.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/new.cpp b/src/new.cpp index 35f481db0..8013d89ae 100644 --- a/src/new.cpp +++ b/src/new.cpp @@ -135,7 +135,8 @@ _LIBCPP_WEAK void operator delete(void* ptr) _NOEXCEPT { - ::free(ptr); + if (ptr) + ::free(ptr); } _LIBCPP_WEAK @@ -256,10 +257,11 @@ _LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t) _NOEXCEPT { + if (ptr) #if defined(_LIBCPP_MSVCRT_LIKE) - ::_aligned_free(ptr); + ::_aligned_free(ptr); #else - ::free(ptr); + ::free(ptr); #endif } |