development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-06 02:09:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-7_emteere_WIndowsResourceReferenceFix'

Browse source
This commit is contained in:
ghidra1 2024-05-02 20:10:19 -04:00
parent 3434cfb699 09bd2bebe0
commit 7edb10ab60
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Features/Decompiler/ghidra_scripts/WindowsResourceReference.java
View file

@ -694,10 +694,10 @@ public class WindowsResourceReference extends GhidraScript {
followToParam(constUse, defUseList, highFunction, def.getInput(0), doneSet);
return;
case PcodeOp.MULTIEQUAL:
followToParam(constUse, defUseList, highFunction, def.getInput(0), doneSet);
@SuppressWarnings("unchecked")
ArrayList<PcodeOp> splitUseList = (ArrayList<PcodeOp>) defUseList.clone();
followToParam(constUse, splitUseList, highFunction, def.getInput(1), doneSet);
for (int i = 0; i < def.getNumInputs(); i++) {
ArrayList<PcodeOp> splitUseList = new ArrayList<>(defUseList);
followToParam(constUse, splitUseList, highFunction, def.getInput(i), doneSet);
}
return;
case PcodeOp.CAST:
// Cast will expose more Pcode, and could be attached to the same address!
@ -707,7 +707,8 @@ public class WindowsResourceReference extends GhidraScript {
followToParam(constUse, defUseList, highFunction, def.getInput(0), doneSet);
return;
case PcodeOp.INDIRECT:
if (def.getOutput().getAddress().equals(def.getInput(0).getAddress())) {
Varnode output = def.getOutput();
if (output.getAddress().equals(def.getInput(0).getAddress())) {
followToParam(constUse, defUseList, highFunction, def.getInput(0), doneSet);
return;
}

2
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/plugin/core/script/WindowsResourceReferenceScriptTest.java
View file

@ -145,7 +145,7 @@ public class WindowsResourceReferenceScriptTest extends AbstractGhidraHeadedInte
addr(0x01001f3b, pgm), addr(0x0100398f, pgm), addr(0x01003ade, pgm),
addr(0x01003aec, pgm), addr(0x01003ad0, pgm), addr(0x010039c5, pgm),
addr(0x01003d45, pgm), addr(0x0100385b, pgm), addr(0x01003d36, pgm),
addr(0x01003920, pgm), addr(0x0100390e, pgm) };
addr(0x01003920, pgm), addr(0x0100390e, pgm), addr(0x01003932, pgm) };
return winmineTestAddrs;
}