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

GP-0 - fix PointerApplier for GP-4246

Browse Source
This commit is contained in:
ghizard 2024-02-27 13:00:10 -05:00
parent 23d471731e
commit 31261c0761
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/PointerTypeApplier.java
View File

@ -98,18 +98,23 @@ public class PointerTypeApplier extends MsDataTypeApplier {
switch (msPointerMode) {
case POINTER:
dataType = processPointer(pointerMsType, underlyingType);
break;
case LVALUE_REFERENCE:
dataType = processReference(pointerMsType, underlyingType);
break;
case RVALUE_REFERENCE:
dataType = processReference(pointerMsType, underlyingType);
break;
case MEMBER_DATA_POINTER:
case MEMBER_FUNCTION_POINTER:
dataType = processMemberPointer(pointerMsType, underlyingType);
break;
case INVALID:
case RESERVED:
Msg.warn(this, "Unable to process PointerMode: " + msPointerMode +
". Using default Pointer.");
dataType = PointerDataType.dataType;
break;
default:
throw new PdbException("PDB Error: unhandled PointerMode in " + getClass());
}
@ -142,13 +147,15 @@ public class PointerTypeApplier extends MsDataTypeApplier {
}
private CategoryPath getCategoryPathForMemberPointer(RecordNumber containingClassRecordNumber) {
AbstractMsType containingType = applicator.getTypeRecord(containingClassRecordNumber);
MsTypeApplier applier = applicator.getTypeApplier(containingClassRecordNumber);
if (containingType instanceof AbstractCompositeMsType compositeMsType &&
applier instanceof CompositeTypeApplier compositeApplier) {
SymbolPath symbolPath = compositeApplier.getFixedSymbolPath(compositeMsType);
CategoryPath categoryPath = applicator.getCategory(symbolPath);
return ClassTypeUtils.getInternalsCategoryPath(categoryPath);
if (containingClassRecordNumber != null) {
AbstractMsType containingType = applicator.getTypeRecord(containingClassRecordNumber);
MsTypeApplier applier = applicator.getTypeApplier(containingClassRecordNumber);
if (containingType instanceof AbstractCompositeMsType compositeMsType &&
applier instanceof CompositeTypeApplier compositeApplier) {
SymbolPath symbolPath = compositeApplier.getFixedSymbolPath(compositeMsType);
CategoryPath categoryPath = applicator.getCategory(symbolPath);
return ClassTypeUtils.getInternalsCategoryPath(categoryPath);
}
}
return applicator.getAnonymousTypesCategory();
}