java-11-openjdk/jdk8243210-npe_in_clhsdbscanoops.patch
Andrew Hughes 958c8116e9 Update to jdk-11.0.20.1+1 (GA)
Update release notes to 11.0.20.1+1
Add backport of JDK-8312489 already upstream in 11.0.22 (see OPENJDK-2095)
Add backport of JDK-8243210 already upstream in 11.0.21 (see RH2229269)
Update openjdk_news script to specify subdirectory last
Add missing discover_trees script required by openjdk_news

Resolves: rhbz#2236590
2023-09-06 20:14:31 +01:00

24 lines
1011 B
Diff

commit 9d15f3e6537bf7a5ba081b2a6b7339a601ab7ba5
Author: Thomas Stuefe <stuefe@openjdk.org>
Date: Mon Aug 7 18:13:43 2023 +0000
8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace
Reviewed-by: clanger
Backport-of: 7f634155b5c4b9f07ab73ceb4c6042ac10dad65e
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index 307598f47f..ef8258525d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -121,6 +121,9 @@ public class FileMapInfo {
}
public boolean inCopiedVtableSpace(Address vptrAddress) {
+ if (vptrAddress == null) {
+ return false;
+ }
if (vptrAddress.greaterThan(mdRegionBaseAddress) &&
vptrAddress.lessThanOrEqual(mdRegionEndAddress)) {
return true;