Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-26 05:37:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GT-3545-dragonmacher-gnu-demangler-parsing-bugs'

Fixes #1457 Fixes #1569
This commit is contained in:
ghidorahrex
2020-03-13 12:51:40 -04:00
parent a554b8d0be cb234b09a9
commit f1782a7629
59 changed files with 3255 additions and 7594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/TypeDescriptorModel.java
+6 -3
View File
@@ -602,7 +602,10 @@ public class TypeDescriptorModel extends AbstractCreateDataTypeModel {
if (descriptorName == null) {
return null;
}
DemangledType typeNamespace = new DemangledType(descriptorName);
String demangledSource = mdComplexType.toString();
DemangledType typeNamespace =
new DemangledType(originalTypeName, demangledSource, descriptorName);
DemangledType parentNamespace = getParentNamespace(); // Can be null;
if (parentNamespace != null) {
typeNamespace.setNamespace(parentNamespace);
@@ -614,8 +617,8 @@ public class TypeDescriptorModel extends AbstractCreateDataTypeModel {
return namespace;
}
private boolean isNamespaceDeleted(Namespace namespace2) {
Symbol nsSymbol = namespace2.getSymbol();
private boolean isNamespaceDeleted(Namespace other) {
Symbol nsSymbol = other.getSymbol();
if (nsSymbol == null) {
return false; // global namespace.
}