GP-4459 put back parentList check

NationalSecurityAgency · Apr 3, 2024 · cd780a7 · cd780a7
1 parent f0f2ffc
commit cd780a7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java
@@ -2543,6 +2543,11 @@ private Map<RecoveredClass, Integer> getBaseClassOffsetMap(RecoveredClass recove
  baseClassDescriptorAddress.toString());
  continue;
  }
+
+ // Continue if the class has mult inh but base class is not on the parent list
+ if (!recoveredClass.getParentList().contains(baseClass)) {
+ continue;
+ }
 
  int mdisp = api.getInt(baseClassDescriptorAddress.add(8));
  int pdisp = api.getInt(baseClassDescriptorAddress.add(12));