Skip to content

Ghidra is a software reverse engineering (SRE) framework

Fixing analysis fail with function entryPoint may not be created on defined data error (Closes #8238)

Paul Hordiienko700a06e8975e
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ControlFlowGuard.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ControlFlowGuard.java
index ac8b765b31..fd2da24b3f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ControlFlowGuard.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ControlFlowGuard.java
@@ -150,7 +150,13 @@ public class ControlFlowGuard {
}
for (Address target : getFunctionAddressesFromTable(program, tableData)) {
- AbstractProgramLoader.markAsFunction(program, null, target);
+ if (program.getListing().getDefinedDataAt(target) == null) {
+ AbstractProgramLoader.markAsFunction(program, null, target);
+ }
+ else {
+ log.appendMsg("Unable to mark Control Flow Guard function at " + target +
+ ". Data is already defined there.");
+ }
}
}