8286519: Better memory handling

Reviewed-by: yan Backport-of: adfc2b195a84867fc2a66e00fad7f3c95693bc3b
openjdk · Oct 18, 2022 · eb999ab · eb999ab
1 parent e9b1202
commit eb999ab
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
@@ -696,6 +696,11 @@ void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
   NMT_TrackingLevel level = MemTracker::tracking_level();
   size_t            nmt_header_size = MemTracker::malloc_header_size(level);
 
+  // Check for overflow.
+  if (size + nmt_header_size < size) {
+    return NULL;
+  }
+
 #ifndef ASSERT
   const size_t alloc_size = size + nmt_header_size;
 #else