Tighten tagged pointer mask, handle tagged pointers in objc_method_t

jonpalmisc · Feb 16, 2022 · c969911 · c969911
1 parent 941a3c4
commit c969911
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Core/Analyzers/ClassAnalyzer.cpp b/Core/Analyzers/ClassAnalyzer.cpp
@@ -36,9 +36,9 @@ MethodListInfo ClassAnalyzer::analyzeMethodList(uint64_t address)
             mi.typeAddress = mi.address + 4 + static_cast<int32_t>(m_file->readInt());
             mi.implAddress = mi.address + 8 + static_cast<int32_t>(m_file->readInt());
         } else {
-            mi.nameAddress = m_file->readLong();
-            mi.typeAddress = m_file->readLong();
-            mi.implAddress = m_file->readLong();
+            mi.nameAddress = arp(m_file->readLong());
+            mi.typeAddress = arp(m_file->readLong());
+            mi.implAddress = arp(m_file->readLong());
         }
 
         if (!mli.hasRelativeOffsets() || mli.hasDirectSelectors()) {

diff --git a/Include/ObjectiveNinjaCore/ABI.h b/Include/ObjectiveNinjaCore/ABI.h
@@ -14,7 +14,7 @@ namespace ObjectiveNinja::ABI {
 /**
  * Bitmask used to remove the tags from a tagged pointer.
  */
-constexpr uint64_t PointerMask = 0xFFFFFFFFF;
+constexpr uint64_t PointerMask = 0x7FFFFFFFF;
 
 /**
  * Mask used to extract the flags from a Swift class data structure pointer.