8273414: ResourceObj::operator delete should handle nullptr in debug builds

lkorinth · lkorinth · commit e66bf472484f · 2021-09-14T21:17:59.000Z
Reviewed-by: stuefe
diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp
@@ -147,6 +147,9 @@ void* ResourceObj::operator new(size_t size, const std::nothrow_t&  nothrow_cons
 }
 
 void ResourceObj::operator delete(void* p) {
+  if (p == nullptr) {
+    return;
+  }
   assert(((ResourceObj *)p)->allocated_on_C_heap(),
          "delete only allowed for C_HEAP objects");
   DEBUG_ONLY(((ResourceObj *)p)->_allocation_t[0] = (uintptr_t)badHeapOopVal;)

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,9 @@ void* ResourceObj::operator new(size_t size, const std::nothrow_t& nothrow_cons`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`void ResourceObj::operator delete(void* p) {`
	`150`	`+ if (p == nullptr) {`
	`151`	`+ return;`
	`152`	`+ }`
`150`	`153`	`assert(((ResourceObj *)p)->allocated_on_C_heap(),`
`151`	`154`	`"delete only allowed for C_HEAP objects");`
`152`	`155`	`DEBUG_ONLY(((ResourceObj *)p)->_allocation_t[0] = (uintptr_t)badHeapOopVal;)`