yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5937-dragonmacher-symbol-tree-fixes'

Browse source
This commit is contained in:
Ryan Kurtz 2025-08-20 05:15:18 -04:00
commit c5d0f6925b
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/nodes/SymbolCategoryNode.java
View file

@ -68,13 +68,18 @@ public abstract class SymbolCategoryNode extends SymbolTreeNode {
@Override @Override
public List<GTreeNode> generateChildren(TaskMonitor monitor) throws CancelledException { public List<GTreeNode> generateChildren(TaskMonitor monitor) throws CancelledException {
if (!isEnabled) { if (!isEnabled) {
return Collections.emptyList(); return List.of();
}
SymbolTreeRootNode root = (SymbolTreeRootNode) getRoot();
if (root == null) {
// this can happen if the tree is reloaded while we are searching in a background task
return List.of();
} }
SymbolType symbolType = symbolCategory.getSymbolType(); SymbolType symbolType = symbolCategory.getSymbolType();
List<GTreeNode> list = getSymbols(symbolType, monitor); List<GTreeNode> list = getSymbols(symbolType, monitor);
monitor.checkCancelled(); monitor.checkCancelled();
SymbolTreeRootNode root = (SymbolTreeRootNode) getRoot();
int groupThreshold = root.getNodeGroupThreshold(); int groupThreshold = root.getNodeGroupThreshold();
return OrganizationNode.organize(list, groupThreshold, monitor); return OrganizationNode.organize(list, groupThreshold, monitor);
} }
@ -322,6 +327,9 @@ public abstract class SymbolCategoryNode extends SymbolTreeNode {
if (this == o) { if (this == o) {
return true; return true;
} }
if (o == null) {
return false;
}
if (getClass() != o.getClass()) { if (getClass() != o.getClass()) {
return false; return false;
} }