Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-0 Fix for minor instruction length override regression

emteerec58647b7d297
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.java
index d0886c8e00..f1be3ba5ee 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, Instructio
FlowType myFlowType = getFlowType(); // getFlowType will validate
if (myFlowType.hasFallthrough()) {
try {
- return address.addNoWrap(getDefaultFallThroughOffset());
+ return getAddress().addNoWrap(proto.getFallThroughOffset(this));
}
catch (AddressOverflowException e) {
// ignore