mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Keep null records out of FID cache

Browse Source
This commit is contained in:
caheckman
2020-06-10 17:17:06 -04:00
parent 69dd762e4b
commit 2671c5d22d
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/hash/FunctionBodyFunctionExtentGenerator.java
View File

@@ -19,12 +19,7 @@ import java.util.ArrayList;
import java.util.List;
import ghidra.program.model.address.AddressSetView;
import ghidra.program.model.listing.CodeUnit;
import ghidra.program.model.listing.Function;
import ghidra.program.model.listing.Instruction;
import ghidra.program.model.listing.InstructionIterator;
import ghidra.program.model.listing.Listing;
import ghidra.program.model.listing.Program;
import ghidra.program.model.listing.*;
/**
* Calculates the function extent by the function body; i.e. what's saved
@@ -35,9 +30,15 @@ import ghidra.program.model.listing.Program;
public class FunctionBodyFunctionExtentGenerator implements FunctionExtentGenerator {
@Override
public List<CodeUnit> calculateExtent(Function func) {
if (func == null) {
return List.of();
}
final AddressSetView body = func.getBody();
if (body.isEmpty()) {
return List.of();
}
ArrayList<CodeUnit> units = new ArrayList<CodeUnit>();
final AddressSetView body = func.getBody();
final Program program = func.getProgram();
final Listing listing = program.getListing();

3
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/service/FIDFixedSizeMRUCachingFactory.java
View File

@@ -49,6 +49,9 @@ public class FIDFixedSizeMRUCachingFactory implements Factory<Function, FidHashQ
}
value = delegate.get(func);
if (value == null) {
return null;
}
cache.put(entryPoint, value);
return value;
}

3
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/service/FidHasherFactory.java
View File

@@ -35,9 +35,6 @@ class FidHasherFactory implements Factory<Function, FidHashQuad> {
@Override
public FidHashQuad get(Function function) {
try {
if (function == null) {
return null;
}
return hasher.hash(function);
}
catch (MemoryAccessException e) {