[RTTI] Fix exception in binary with a erroneous class hierarchy descriptor

1 files changed, 10 insertions, 0 deletions

diff --git a/plugins/rtti/microsoft.cpp b/plugins/rtti/microsoft.cpp
index 1299170c..d5e14648 100644
--- a/plugins/rtti/microsoft.cpp
+++ b/plugins/rtti/microsoft.cpp
@@ -431,6 +431,16 @@ std::optional<ClassInfo> MicrosoftRTTIProcessor::ProcessRTTI(uint64_t coLocatorA
     auto classInfo = ClassInfo{RTTIProcessorType::Microsoft, className.value()};
 
     auto classHierarchyDescAddr = resolveAddr(coLocator->pClassHierarchyDescriptor);
+
+    // Verify the class hierarchy descriptor signature is zero.
+    auto reader = BinaryReader(m_view);
+    reader.Seek(classHierarchyDescAddr);
+    if (auto signature = reader.Read32(); signature != 0)
+    {
+        m_logger->LogWarn("Skipping CompleteObjectorLocator with non-zero hierarchy descriptor signature %llx", coLocatorAddr);
+        return std::nullopt;
+    }
+
     classInfo.baseClasses = ProcessClassHierarchyDescriptor(classHierarchyDescAddr, coLocator.value(), classInfo);
 
     // Locate the current base class if we are in one.