commit b85fdc4ffde48f2035e4621d4f9af69bf16f2136
author Konstantin Varlamov <varconsteq@gmail.com> Wed Nov 08 02:12:15 2023
committer GitHub <noreply@github.com> Wed Nov 08 02:12:15 2023
tree 0a0495a7298f60330f34791d8272d3f079028758
parent c86d35a5f422380f51b1e73621a2542535b9c060

[libc++][hardening] Add `_LIBCPP_ASSERT_NON_NULL` to check for null pointers (#71428)

libcxx/src/memory_resource.cpp

diff --git a/libcxx/src/memory_resource.cpp b/libcxx/src/memory_resource.cpp
index 3786ec5..afd1b89 100644
--- a/libcxx/src/memory_resource.cpp
+++ b/libcxx/src/memory_resource.cpp
@@ -175,7 +175,7 @@
 
 void unsynchronized_pool_resource::__adhoc_pool::__do_deallocate(
     memory_resource* upstream, void* p, size_t bytes, size_t align) {
-  _LIBCPP_ASSERT_UNCATEGORIZED(__first_ != nullptr, "deallocating a block that was not allocated with this allocator");
+  _LIBCPP_ASSERT_NON_NULL(__first_ != nullptr, "deallocating a block that was not allocated with this allocator");
   if (__first_->__start_ == p) {
     __chunk_footer* next = __first_->__next_;
     upstream->deallocate(p, __first_->__allocation_size(), __first_->__align_);
@@ -401,7 +401,7 @@
   if (i == __num_fixed_pools_)
     return __adhoc_pool_.__do_deallocate(__res_, p, bytes, align);
   else {
-    _LIBCPP_ASSERT_UNCATEGORIZED(
+    _LIBCPP_ASSERT_NON_NULL(
         __fixed_pools_ != nullptr, "deallocating a block that was not allocated with this allocator");
     __fixed_pools_[i].__evacuate(p);
   }