Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-09-20 09:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-4926 Don't remove jump reference to next instruction, unless the

Browse Source 
instruction flowType says it has a fallthrough
This commit is contained in:
emteere 2024-09-13 09:39:14 -04:00 committed by Ryan Kurtz
parent 9a04ea643a
commit 63a138dd12
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java
View File

@ -2964,8 +2964,13 @@ public class CodeManager implements ErrorHandler, ManagerDB {
if (flowType == null) {
flowType = RefType.INVALID;
}
// Only remove jump reference if the function flowtype says it has a fallthrough
// Removing the branch to next address if instruction has no fallthrough causes
// flow following issues, for example creating a function body.
boolean isFallthrough =
(flowType.isJump() && flowAddr.equals(inst.getMaxAddress().next()));
(flowType.isJump() && flowAddr.equals(inst.getMaxAddress().next())) &&
inst.hasFallthrough();
if (!isFallthrough) {
mnemonicPrimaryRef = addDefaultMemoryReferenceIfMissing(inst,
Reference.MNEMONIC, flowAddr, flowType, oldRefList, mnemonicPrimaryRef);