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

Merge remote-tracking branch 'origin/Ghidra_11.4'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-06-06 14:31:03 -04:00
parent 1b8faba952 700a06e897
commit 5b0cac73c4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ControlFlowGuard.java
View File

@@ -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.");
}
}
}