yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Corrected NPE in decompiler.

Browse source 
Reference overrides must ignore external references.
This commit is contained in:
ghidra1 2019-09-06 18:34:06 -04:00
parent e6cbefc706
commit 2d144fb457
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerUtils.java
View file

@ -343,8 +343,10 @@ public class DecompilerUtils {
if (token instanceof ClangFuncNameToken) { if (token instanceof ClangFuncNameToken) {
// special case: we know that name tokens do not have addresses // special case: we know that name tokens do not have addresses
Function function = getFunction(program, (ClangFuncNameToken) token); Function function = getFunction(program, (ClangFuncNameToken) token);
if (function != null) {
return function.getEntryPoint(); return function.getEntryPoint();
} }
}
Address address = token.getMinAddress(); Address address = token.getMinAddress();
if (address != null) { if (address != null) {

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/InstructionPcodeOverride.java
View file

@ -47,7 +47,7 @@ public class InstructionPcodeOverride implements PcodeOverride {
primaryOverridingReferences = new ArrayList<>(); primaryOverridingReferences = new ArrayList<>();
for (Reference ref : instr.getReferencesFrom()) { for (Reference ref : instr.getReferencesFrom()) {
if (!ref.isPrimary()) { if (!ref.isPrimary() || !ref.getToAddress().isMemoryAddress()) {
continue; continue;
} }
RefType type = ref.getReferenceType(); RefType type = ref.getReferenceType();