Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few bugs/tests related to new symbol schema

Browse Source
This commit is contained in:
ghidravore 2021-09-29 11:44:41 -04:00
parent 156ce7ef80
commit 2a96958fd3
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java
View File

@ -1033,11 +1033,22 @@ public class SymbolManager implements SymbolTable, ManagerDB {
return list;
}
private Symbol searchNamespaceForFirstSymbol(String name, Namespace namespace,
Predicate<Symbol> test) {
for (Symbol symbol : getSymbols(namespace)) {
if (name.equals(symbol.getName()) && test.test(symbol)) {
return symbol;
}
}
return null;
}
private Symbol getSymbolForDynamicName(String name) {
Address address = SymbolUtilities.parseDynamicName(addrMap.getAddressFactory(), name);
if (address != null) {
Symbol primarySymbol = getPrimarySymbol(address);
if (primarySymbol != null && primarySymbol.getSource() == SourceType.DEFAULT) {
if (primarySymbol != null && primarySymbol.getSource() == SourceType.DEFAULT &&
name.equals(primarySymbol.getName())) {
return primarySymbol;
}
}
@ -1050,6 +1061,18 @@ public class SymbolManager implements SymbolTable, ManagerDB {
if (namespace == null) {
namespace = namespaceMgr.getGlobalNamespace();
}
// if name is possible default parameter or local variable name, must do brute force search
if (namespace instanceof Function &&
SymbolUtilities.isPossibleDefaultLocalOrParamName(name)) {
return searchNamespaceForFirstSymbol(name, namespace, test);
}
// if the name is a possible default external name, do brute force search
if (namespace.isExternal() && SymbolUtilities.isPossibleDefaultExternalName(name)) {
return searchNamespaceForFirstSymbol(name, namespace, test);
}
lock.acquire();
try {
RecordIterator it = adapter.getSymbolsByNameAndNamespace(name, namespace.getID());