Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-09-20 09:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4925_dev747368_PR-6823_roblabla_fix-xml-import-namespaces'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-16 12:40:49 -04:00
commit 5d5777e0af
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Ghidra/Features/Base/src/main/java/ghidra/app/util/xml/SymbolTableXmlMgr.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -197,7 +197,7 @@ class SymbolTableXmlMgr {
String addrStr = element.getAttribute("ADDRESS"); String addrStr = element.getAttribute("ADDRESS");
String namespace = element.getAttribute("NAMESPACE"); String namespace = element.getAttribute("NAMESPACE");
if (namespace != null && namespace.endsWith("::")) { if (namespace != null && namespace.endsWith("::")) {
namespace = namespace.substring(namespace.length() - 2); namespace = namespace.substring(0, namespace.length() - 2);
} }
String primary = element.getAttribute("PRIMARY"); String primary = element.getAttribute("PRIMARY");
String sourceTypeString = element.getAttribute("SOURCE_TYPE"); String sourceTypeString = element.getAttribute("SOURCE_TYPE");
@ -233,13 +233,8 @@ class SymbolTableXmlMgr {
scope = localNamespace; scope = localNamespace;
} }
else if (namespace != null && namespace.length() != 0) { else if (namespace != null && namespace.length() != 0) {
if (program.getGlobalNamespace().equals(localNamespace)) { scope = NamespaceUtils.createNamespaceHierarchy(namespace,
scope = NamespaceUtils.createNamespaceHierarchy(namespace, program.getGlobalNamespace(), program, sourceType);
program.getGlobalNamespace(), program, sourceType);
}
else {
name = namespace + name;
}
} }
Symbol s = symbolTable.getPrimarySymbol(addr); Symbol s = symbolTable.getPrimarySymbol(addr);