Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-26 06:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-4337: Fixing "null" demangler name in monitor

Browse Source
This commit is contained in:
Ryan Kurtz 2024-03-21 07:49:42 -04:00
parent 568ebd45ef
commit bb933e2e0f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AbstractDemanglerAnalyzer.java
View File

@ -46,6 +46,8 @@ public abstract class AbstractDemanglerAnalyzer extends AbstractAnalyzer {
private static final AddressSetView EXTERNAL_SET = new AddressSet(
AddressSpace.EXTERNAL_SPACE.getMinAddress(), AddressSpace.EXTERNAL_SPACE.getMaxAddress());
private String baseMonitorMessage;
public AbstractDemanglerAnalyzer(String name, String description) {
super(name, description, AnalyzerType.BYTE_ANALYZER);
setPriority(AnalysisPriority.DATA_TYPE_PROPOGATION.before().before().before());
@ -93,21 +95,21 @@ public abstract class AbstractDemanglerAnalyzer extends AbstractAnalyzer {
set = set.subtract(EXTERNAL_SET);
}
String baseMonitorMessage = monitor.getMessage();
int memorySymbolCount =
demangleSymbols(program, set, 0, baseMonitorMessage, options, log, monitor);
if (baseMonitorMessage == null) {
baseMonitorMessage = monitor.getMessage();
}
int memorySymbolCount = demangleSymbols(program, set, 0, options, log, monitor);
if (demangleExternals) {
// process external symbols last
demangleSymbols(program, EXTERNAL_SET, memorySymbolCount, baseMonitorMessage, options,
log, monitor);
demangleSymbols(program, EXTERNAL_SET, memorySymbolCount, options, log, monitor);
}
return true;
}
private int demangleSymbols(Program program, AddressSetView set, int initialCount,
String baseMonitorMessage, DemanglerOptions options, MessageLog log,
TaskMonitor monitor) throws CancelledException {
DemanglerOptions options, MessageLog log, TaskMonitor monitor)
throws CancelledException {
int count = initialCount;
SymbolTable symbolTable = program.getSymbolTable();