Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-25 13:42:06 +00:00
Code Issues Packages Projects 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerUtils.java
View File

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

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<>();
for (Reference ref : instr.getReferencesFrom()) {
if (!ref.isPrimary()) {
if (!ref.isPrimary() || !ref.getToAddress().isMemoryAddress()) {
continue;
}
RefType type = ref.getReferenceType();