Backport cf4ede0e544fbd758cc9e93c695fb19fb7da0f9a

neethu-prasad · Jun 13, 2024 · c6128ea · c6128ea
1 parent 9056b3b
commit c6128ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
@@ -103,6 +103,9 @@ bool JfrCheckpointManager::initialize() {
   // preallocate buffer count to each of the epoch live lists
   for (size_t i = 0; i < global_buffer_prealloc_count * 2; ++i) {
     Buffer* const buffer = mspace_allocate(global_buffer_size, _global_mspace);
+    if (buffer == nullptr) {
+      return false;
+    }
     _global_mspace->add_to_live_list(buffer, i % 2 == 0);
   }
   assert(_global_mspace->free_list_is_empty(), "invariant");

diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp
@@ -85,6 +85,9 @@ bool JfrStringPool::initialize() {
   // preallocate buffer count to each of the epoch live lists
   for (size_t i = 0; i < string_pool_cache_count * 2; ++i) {
     Buffer* const buffer = mspace_allocate(string_pool_buffer_size, _mspace);
+    if (buffer == nullptr) {
+      return false;
+    }
     _mspace->add_to_live_list(buffer, i % 2 == 0);
   }
   assert(_mspace->free_list_is_empty(), "invariant");