mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-3861_ghidra007_rtti_added_exceptions_for_missing_rtti' into
Ghidra_10.4 (Closes #5815)
This commit is contained in:
Ryan Kurtz
2023-09-22 14:04:02 -04:00
parent 5c8251f891 cb410f732c
commit bf8d96164d
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java
View File

@@ -1087,6 +1087,11 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
List<RecoveredClass> classHierarchyFromRTTI = getClassHierarchyFromRTTI(recoveredClass);
if (classHierarchyFromRTTI.size() == 0) {
throw new IllegalArgumentException("Unexpected empty class hierarchy for " +
recoveredClass.getClassNamespace().getName(true));
}
if (classHierarchyFromRTTI.size() > 0) {
recoveredClass.setClassHierarchy(classHierarchyFromRTTI);
@@ -1120,11 +1125,24 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
if (recoveredClass.hasMultipleInheritance()) {
List<RecoveredClass> classHierarchy = recoveredClass.getClassHierarchy();
if (classHierarchy.size() <= 1) {
throw new IllegalArgumentException(
"Class hierarchy for class should be more than 1 since it has multiple inheritance" +
recoveredClass.getClassNamespace().getName(true));
}
int index = 1;
while (index < classHierarchy.size()) {
monitor.checkCancelled();
RecoveredClass parentClass = classHierarchy.get(index);
List<RecoveredClass> parentClassHierarchy = parentClass.getClassHierarchy();
if (parentClassHierarchy.size() < 1) {
// shouldn't get here since the first loop should have removed all classes
// with incorrect class hierarchy
throw new IllegalArgumentException(
"Parent class has empty class hierarchy " +
parentClass.getClassNamespace().getName(true));
}
recoveredClass.addClassHierarchyMapping(parentClass, parentClassHierarchy);
updateClassWithParent(parentClass, recoveredClass);
index += parentClassHierarchy.size();
@@ -1190,17 +1208,24 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
extendedFlatAPI.getSingleReferencedAddress(pointerAddress);
if (baseClassDescriptorAddress == null) {
return classHierarchy;
throw new IllegalArgumentException(
"Missing expected pointer at " + pointerAddress.toString());
//return classHierarchy;
}
Symbol primarySymbol = symbolTable.getPrimarySymbol(baseClassDescriptorAddress);
if (primarySymbol == null) {
return classHierarchy;
throw new IllegalArgumentException(
"Missing expected BaseClassDescriptor symbol at " +
baseClassDescriptorAddress.toString());
//return classHierarchy;
}
Namespace pointedToNamespace = primarySymbol.getParentNamespace();
if (pointedToNamespace == null) {
return classHierarchy;
throw new IllegalArgumentException("Missing expected class namesapce at " +
baseClassDescriptorAddress.toString());
//return classHierarchy;
}
// if the namespace isn't in the map then it is a class
@@ -1221,7 +1246,8 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
}
}
else if (symbols.size() > 1) {
//TODO: throw exception?
throw new IllegalArgumentException("More than one Base Class Array for " +
recoveredClass.getClassNamespace().getName(true));
}
return classHierarchy;
}