Ghidra is a software reverse engineering (SRE) framework
GP-0 Correction to GP-5619 regression
ghidra1749fdbb556ea
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.javaindex f1be3ba5ee..9bec2ce37c 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java@@ -938,7 +938,7 @@ public class InstructionDB extends CodeUnitDB implements Instruction, InstructioFlowType myFlowType = getFlowType(); // getFlowType will validateif (myFlowType.hasFallthrough()) {try {- return getAddress().addNoWrap(proto.getFallThroughOffset(this));+ return address.addNoWrap(getDefaultFallThroughOffset());}catch (AddressOverflowException e) {// ignore@@ -950,7 +950,7 @@ public class InstructionDB extends CodeUnitDB implements Instruction, Instructio@Overridepublic int getDefaultFallThroughOffset() {if (proto.getDelaySlotByteCount() <= 0) {- return getLength();+ return proto.getLength();}lock.acquire();try {