Merge remote-tracking branch 'origin/GT-3217_dev747368_NPE_in_FindNoReturnFunctionsAnalyzer' into Ghidra_9.1

This commit is contained in:
Ryan Kurtz 2019-10-15 13:41:33 -04:00
commit a05638dc5e

View File

@ -364,7 +364,7 @@ public class FindNoReturnFunctionsAnalyzer extends AbstractAnalyzer {
continue;
}
Instruction oinst = cp.getListing().getInstructionAt(fromAddress);
if (!checkNonReturningIndicators(oinst, noReturnSet, blockModel)) {
if ( oinst == null || !checkNonReturningIndicators(oinst, noReturnSet, blockModel)) {
continue;
}