From 877b168224f9dcdbb1fea70b5e5ed63252046f09 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Mon, 27 Sep 2021 01:22:51 -0400 Subject: [PATCH] GP-943 Corrected RecoverClassesFromRTTIScriptTest4 test failure --- .../ghidra_scripts/classrecovery/RecoveredClass.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java index 495b630200..80b386f1cd 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java @@ -488,7 +488,8 @@ public class RecoveredClass { int offset = newComponent.getOffset(); - DataTypeComponent currentComponent = computedClassStructure.getComponentAt(offset); + DataTypeComponent currentComponent = + computedClassStructure.getComponentContaining(offset); DataType currentComponentDataType = currentComponent.getDataType(); if (currentComponentDataType.equals(newComponentDataType)) {