yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 01:39:21 +02:00
Code Issues Releases Wiki Activity

GP-4626 - MDMang updates for suffix on mangled type names plus other fixes

Browse source
This commit is contained in:
ghizard 2024-06-03 18:03:40 -04:00
parent 2a83263d73
commit ead1cc5b37
14 changed files with 626 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ghidra/Features/MicrosoftCodeAnalyzer/src/main/java/ghidra/app/cmd/data/TypeDescriptorModel.java
View file

@ -255,7 +255,8 @@ public class TypeDescriptorModel extends AbstractCreateDataTypeModel {
Address typeInfoVftableAddress = null;
try {
typeInfoVftableAddress = RttiUtil.findTypeInfoVftableAddress(program, TaskMonitor.DUMMY);
typeInfoVftableAddress =
RttiUtil.findTypeInfoVftableAddress(program, TaskMonitor.DUMMY);
}
catch (CancelledException e) {
throw new AssertException(e);
@ -356,10 +357,11 @@ public class TypeDescriptorModel extends AbstractCreateDataTypeModel {
throw new UndefinedValueException(
"No vf table pointer is defined for this TypeDescriptor model.");
}
Address vfTableAddress;
// component 0 is either vf table pointer or hash value.
vfTableAddress = EHDataTypeUtilities.getAddress(getDataType(), VF_TABLE_OR_HASH_ORDINAL, getMemBuffer());
vfTableAddress =
EHDataTypeUtilities.getAddress(getDataType(), VF_TABLE_OR_HASH_ORDINAL, getMemBuffer());
return (vfTableAddress != null && vfTableAddress.getOffset() != 0) ? vfTableAddress : null;
}
@ -624,17 +626,11 @@ public class TypeDescriptorModel extends AbstractCreateDataTypeModel {
private static MDComplexType getMDComplexType(Program program, String mangledString) {
MDMangGhidra demangler = new MDMangGhidra();
try {
MDParsableItem parsableItem = demangler.demangle(mangledString, true);
if (!(parsableItem instanceof MDDataType)) {
// Not an MDDataType as expected.
return null;
}
MDDataType mangledDt = (MDDataType) parsableItem;
if (mangledDt instanceof MDModifierType) {
MDModifierType modifierType = (MDModifierType) mangledDt;
MDDataType mangledDt = demangler.demangleType(mangledString, true);
if (mangledDt instanceof MDModifierType modifierType) {
MDType refType = modifierType.getReferencedType();
if (refType instanceof MDComplexType) {
return (MDComplexType) refType;
if (refType instanceof MDComplexType complexType) {
return complexType;
}
}
return null; // Not an MDComplexType