yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

GP-2731 use warning bookmark for bad flows to address 00000000 instead

Browse source 
of error bookmark
This commit is contained in:
ghidra1 2022-12-07 11:50:08 -05:00
parent 102d1b7151
commit 791b4108de
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java
View file

@ -1387,21 +1387,26 @@ public class Disassembler implements DisassemblerConflictHandler {
return;
}
boolean markAsError = true;
Address flowFrom = conflict.getFlowFromAddress();
String flowMsg = flowFrom != null ? (" (flow from " + flowFrom + ")") : "";
Address markAddr = address;
if (!isBookmarkAllowed(markAddr)) {
if (flowFrom != null) {
markAddr = flowFrom;
if (conflict.getInstructionErrorType() == InstructionErrorType.MEMORY &&
address.getOffset() == 0) {
markAsError = false;
}
}
else {
return;
}
}
bmMgr.setBookmark(markAddr, BookmarkType.ERROR, ERROR_BOOKMARK_CATEGORY,
conflict.getConflictMessage() + flowMsg);
bmMgr.setBookmark(markAddr, markAsError ? BookmarkType.ERROR : BookmarkType.WARNING,
ERROR_BOOKMARK_CATEGORY, conflict.getConflictMessage() + flowMsg);
}
private boolean isBookmarkAllowed(Address addr) {