From 700a06e8975e5cddfedee2fd97cb470f58506aa8 Mon Sep 17 00:00:00 2001 From: Paul Hordiienko Date: Thu, 5 Jun 2025 18:47:25 +0200 Subject: [PATCH] Fixing analysis fail with function entryPoint may not be created on defined data error (Closes #8238) --- .../ghidra/app/util/bin/format/pe/ControlFlowGuard.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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."); + } } }