Merge pull request #17264 from dnakamura/log_crash

DDR: Fix NPE in StackMap logging
eclipse-openj9 · Apr 25, 2023 · e541240 · e541240
2 parents 222d7c0 + edb7eb4
commit e541240
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java
@@ -786,11 +786,16 @@ private int outputStackMap(int[] resultsArray, int bits) throws CorruptDataExcep
 
 				buffer.append("outputStackMap. bits = ");
 				buffer.append(bits);
-				buffer.append(" resultsArray size = " + resultsArray.length);
-				buffer.append(" result: ");
-
-				for (int i=0;i < resultsArray.length; i++) {
-					buffer.append(Integer.toHexString(resultsArray[i]));
+				if (resultsArray != null) {
+					buffer.append(" resultsArray size = ");
+					buffer.append(resultsArray.length);
+					buffer.append(" result: ");
+
+					for (int i=0;i < resultsArray.length; i++) {
+						buffer.append(Integer.toHexString(resultsArray[i]));
+					}
+				} else {
+					buffer.append(" resultsArray = null");
 				}
 
 				logger.logp(FINE,"StackMap_V1","outputStackMap",buffer.toString());