6817: AutoBoxing rule can crash due to null dereference

thegreystone · thegreystone · commit fb71a220f82e · 2021-07-26T19:41:06.000Z
Reviewed-by: ghb
diff --git a/core/org.openjdk.jmc.flightrecorder.rules.jdk/src/main/java/org/openjdk/jmc/flightrecorder/rules/jdk/memory/AutoBoxingRule.java b/core/org.openjdk.jmc.flightrecorder.rules.jdk/src/main/java/org/openjdk/jmc/flightrecorder/rules/jdk/memory/AutoBoxingRule.java
@@ -187,7 +187,9 @@ protected IResult getResult(IItemCollection items, IPreferenceValueProvider vp,
 					} else if (firstBranch.getEndFork().getBranchCount() > 0) {
 						secondFrame = firstBranch.getEndFork().getBranch(0).getFirstFrame();
 					}
-					secondFrameFromMostAllocated = secondFrame.getFrame();
+					if (secondFrame != null) {
+						secondFrameFromMostAllocated = secondFrame.getFrame();
+					}
 				}
 				allocationSizeByType.put(method.getType(), total);
 			}

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,9 @@ protected IResult getResult(IItemCollection items, IPreferenceValueProvider vp,`
`187`	`187`	`} else if (firstBranch.getEndFork().getBranchCount() > 0) {`
`188`	`188`	`secondFrame = firstBranch.getEndFork().getBranch(0).getFirstFrame();`
`189`	`189`	`}`
`190`		`- secondFrameFromMostAllocated = secondFrame.getFrame();`
	`190`	`+ if (secondFrame != null) {`
	`191`	`+ secondFrameFromMostAllocated = secondFrame.getFrame();`
	`192`	`+ }`
`191`	`193`	`}`
`192`	`194`	`allocationSizeByType.put(method.getType(), total);`
`193`	`195`	`}`