From abaa6d1750c708413b8a4a7817707c3d9faecbe7 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Mon, 20 Jan 2025 17:43:24 +1100 Subject: MSVC RTTI: Fix typo on pClassHierarchyDescriptor --- plugins/msvc_rtti/rtti.cpp | 8 ++++---- plugins/msvc_rtti/rtti.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/msvc_rtti/rtti.cpp b/plugins/msvc_rtti/rtti.cpp index 1ec85393..afaa8424 100644 --- a/plugins/msvc_rtti/rtti.cpp +++ b/plugins/msvc_rtti/rtti.cpp @@ -60,7 +60,7 @@ CompleteObjectLocator::CompleteObjectLocator(BinaryView *view, uint64_t address) offset = reader.Read32(); cdOffset = reader.Read32(); pTypeDescriptor = static_cast(reader.Read32()); - pClassHeirarchyDescriptor = static_cast(reader.Read32()); + pClassHierarchyDescriptor = static_cast(reader.Read32()); if (signature == COL_SIG_REV1) { pSelf = static_cast(reader.Read32()); @@ -93,7 +93,7 @@ std::optional ReadCompleteObjectorLocator(BinaryView *vie if (outsideSection(coLocator.pTypeDescriptor + startAddr)) return std::nullopt; - if (outsideSection(coLocator.pClassHeirarchyDescriptor + startAddr)) + if (outsideSection(coLocator.pClassHierarchyDescriptor + startAddr)) return std::nullopt; } else @@ -102,7 +102,7 @@ std::optional ReadCompleteObjectorLocator(BinaryView *vie if (outsideSection(coLocator.pTypeDescriptor)) return std::nullopt; - if (outsideSection(coLocator.pClassHeirarchyDescriptor)) + if (outsideSection(coLocator.pClassHierarchyDescriptor)) return std::nullopt; } @@ -479,7 +479,7 @@ std::optional MicrosoftRTTIProcessor::ProcessRTTI(uint64_t coLocatorA m_view->DefineDataVariable(typeDescAddr, Confidence(TypeDescriptorType(m_view, typeDesc.name.length()), RTTI_CONFIDENCE)); - auto classHierarchyDescAddr = resolveAddr(coLocator->pClassHeirarchyDescriptor); + auto classHierarchyDescAddr = resolveAddr(coLocator->pClassHierarchyDescriptor); auto classHierarchyDesc = ClassHierarchyDescriptor(m_view, classHierarchyDescAddr); auto classHierarchyDescName = fmt::format("{}::`RTTI Class Hierarchy Descriptor'", classInfo.className); m_view->DefineAutoSymbol(new Symbol{DataSymbol, classHierarchyDescName, classHierarchyDescAddr}); diff --git a/plugins/msvc_rtti/rtti.h b/plugins/msvc_rtti/rtti.h index 062c7b78..ab964ba9 100644 --- a/plugins/msvc_rtti/rtti.h +++ b/plugins/msvc_rtti/rtti.h @@ -51,7 +51,7 @@ namespace BinaryNinja { uint32_t offset; uint32_t cdOffset; int32_t pTypeDescriptor; - int32_t pClassHeirarchyDescriptor; + int32_t pClassHierarchyDescriptor; // Only on 64 bit int32_t pSelf; -- cgit v1.3.1