Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-02 19:30:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-4312_emteere_LockupSelfFallthruOverride' into patch
(Closes #6179)
This commit is contained in:
Ryan Kurtz
2024-02-09 10:16:30 -05:00
parent ec2ecbf390 1da47a7205
commit cd58c76035
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java
+3
View File
@@ -1465,8 +1465,11 @@ public class SymbolicPropogator {
if (ptype == PcodeOp.BRANCH || ptype == PcodeOp.RETURN || ptype == PcodeOp.BRANCHIND) { if (ptype == PcodeOp.BRANCH || ptype == PcodeOp.RETURN || ptype == PcodeOp.BRANCHIND) {
// if says this is branch, but has a fallthru, then really isn't a fallthru // if says this is branch, but has a fallthru, then really isn't a fallthru
// assume the future flow will have flowed the correct info. // assume the future flow will have flowed the correct info.
// only assign for branch if it isn't a degenerate fallthru to itself
if (!minInstrAddress.equals(fallthru)) {
nextAddr = fallthru; nextAddr = fallthru;
} }
}
return nextAddr; return nextAddr;
} }