mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-28 12:45:32 +08:00
GP-6442 Fixing spurious references in called functions the are branched
to and discovered to be called during constant propagation
This commit is contained in:
@@ -484,6 +484,9 @@ public class SymbolicPropogator {
|
|||||||
throws CancelledException {
|
throws CancelledException {
|
||||||
visitedBody = new AddressSet();
|
visitedBody = new AddressSet();
|
||||||
AddressSet conflicts = new AddressSet();
|
AddressSet conflicts = new AddressSet();
|
||||||
|
|
||||||
|
// Locations that were jump and are now call targets and might be on saved future flows
|
||||||
|
HashSet<Address> doNotFlowTo = new HashSet<>();
|
||||||
|
|
||||||
// prime the context stack with the entry point address
|
// prime the context stack with the entry point address
|
||||||
Stack<SavedFlowState> contextStack = new Stack<>();
|
Stack<SavedFlowState> contextStack = new Stack<>();
|
||||||
@@ -536,6 +539,11 @@ public class SymbolicPropogator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// don't follow flow if on list of jump targets that were turned into calls
|
||||||
|
if (doNotFlowTo.contains(nextAddr)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
HashSet<Address> visitSet = visitedMap.get(nextAddr);
|
HashSet<Address> visitSet = visitedMap.get(nextAddr);
|
||||||
if (visitSet != null) {
|
if (visitSet != null) {
|
||||||
@@ -636,6 +644,9 @@ public class SymbolicPropogator {
|
|||||||
Address targets[] = getInstructionFlows(instr);
|
Address targets[] = getInstructionFlows(instr);
|
||||||
for (Address target : targets) {
|
for (Address target : targets) {
|
||||||
handleFunctionSideEffects(instr, target, monitor);
|
handleFunctionSideEffects(instr, target, monitor);
|
||||||
|
// a jump target has already been pushed as a future flow trace
|
||||||
|
// need to make sure values aren't propagated into the call targets
|
||||||
|
doNotFlowTo.add(target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user