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

Merge remote-tracking branch 'origin/GP-5923_dev747368_dynamiclabels_globalnamespace'

Browse source
This commit is contained in:
Ryan Kurtz 2025-08-18 12:50:21 -04:00
commit 6bc3871e67
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/AbstractSymbolTableModel.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -482,7 +482,7 @@ public abstract class AbstractSymbolTableModel extends AddressBasedTableModel<Sy
public String getValue(SymbolRowObject rowObject, Settings settings, Program p,
ServiceProvider svcProvider) throws IllegalArgumentException {
Symbol symbol = rowObject.getSymbol();
if (symbol == null || symbol.isDeleted()) {
if (symbol == null || symbol.isDeleted() || symbol.isDynamic()) {
return null;
}
return symbol.getParentNamespace().getName(true);

6
Ghidra/Features/Base/src/main/java/ghidra/util/table/field/NamespaceTableColumn.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -41,7 +41,7 @@ public class NamespaceTableColumn
return parentPath == null ? GlobalNamespace.GLOBAL_NAMESPACE_NAME : parentPath;
}
Symbol symbol = getSymbol(rowObject, program);
if (symbol != null) {
if (symbol != null && !symbol.isDeleted() && !symbol.isDynamic()) {
return symbol.getParentNamespace().getName(true);
}
Function function =