mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-09-20 09:31:47 +00:00
Merge remote-tracking branch 'origin/GP-4925_dev747368_PR-6823_roblabla_fix-xml-import-namespaces'
This commit is contained in:
commit
5d5777e0af
|
@ -197,7 +197,7 @@ class SymbolTableXmlMgr {
|
|||
String addrStr = element.getAttribute("ADDRESS");
|
||||
String namespace = element.getAttribute("NAMESPACE");
|
||||
if (namespace != null && namespace.endsWith("::")) {
|
||||
namespace = namespace.substring(namespace.length() - 2);
|
||||
namespace = namespace.substring(0, namespace.length() - 2);
|
||||
}
|
||||
String primary = element.getAttribute("PRIMARY");
|
||||
String sourceTypeString = element.getAttribute("SOURCE_TYPE");
|
||||
|
@ -233,14 +233,9 @@ class SymbolTableXmlMgr {
|
|||
scope = localNamespace;
|
||||
}
|
||||
else if (namespace != null && namespace.length() != 0) {
|
||||
if (program.getGlobalNamespace().equals(localNamespace)) {
|
||||
scope = NamespaceUtils.createNamespaceHierarchy(namespace,
|
||||
program.getGlobalNamespace(), program, sourceType);
|
||||
}
|
||||
else {
|
||||
name = namespace + name;
|
||||
}
|
||||
}
|
||||
|
||||
Symbol s = symbolTable.getPrimarySymbol(addr);
|
||||
if (name.startsWith("thunk_")) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user