From 62b0c10d710fadf6b9b7f8060fc8c414ec7ebbf1 Mon Sep 17 00:00:00 2001 From: duke Date: Wed, 28 Aug 2024 12:37:21 +0000 Subject: [PATCH] Backport be1d374bc54d43aae3b3c1feace22d38fe2156b6 --- src/hotspot/share/memory/guardedMemory.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/memory/guardedMemory.cpp b/src/hotspot/share/memory/guardedMemory.cpp index d978b0bea65..6cd141ce4ff 100644 --- a/src/hotspot/share/memory/guardedMemory.cpp +++ b/src/hotspot/share/memory/guardedMemory.cpp @@ -33,7 +33,9 @@ void* GuardedMemory::wrap_copy(const void* ptr, const size_t len, const void* ta if (outerp != NULL) { GuardedMemory guarded(outerp, len, tag); void* innerp = guarded.get_user_ptr(); - memcpy(innerp, ptr, len); + if (ptr != nullptr) { + memcpy(innerp, ptr, len); + } return innerp; } return NULL; // OOM