GP-4584 Corrected FID and ConstantPropogator errors (Closes #6453)

This commit is contained in:
ghidra1 2024-05-08 13:53:31 -04:00
parent c4ea004218
commit b8b0bee4a4
2 changed files with 8 additions and 9 deletions

View file

@ -30,8 +30,7 @@ import ghidra.framework.model.DomainFile;
import ghidra.program.model.address.*;
import ghidra.program.model.lang.*;
import ghidra.program.model.listing.*;
import ghidra.program.model.mem.MemoryAccessException;
import ghidra.program.model.mem.MemoryBlock;
import ghidra.program.model.mem.*;
import ghidra.program.model.symbol.*;
import ghidra.util.Msg;
import ghidra.util.exception.CancelledException;
@ -619,15 +618,13 @@ class FidServiceLibraryIngest {
* @return whether the function is external
*/
private static boolean functionIsExternal(Function function) {
if (function.isExternal()) {
return true;
}
Memory mem = function.getProgram().getMemory();
Address entryPoint = function.getEntryPoint();
MemoryBlock block = function.getProgram().getMemory().getBlock(entryPoint);
if (!block.isInitialized()) {
if (function.isExternal() || !mem.contains(entryPoint)) {
return true;
}
return false;
MemoryBlock block = function.getProgram().getMemory().getBlock(entryPoint);
return block == null || !block.isInitialized() || block.isExternalBlock();
}
private void exclude(DomainFile domainFile, Function function,