[MachO] Avoid leaking MachoObjCProcessor

bdash · bdash · commit 6cb671483fe0 · 2025-07-08T23:32:41.000-07:00
This would leak if parsing of CFStrings was enabled while parsing of
Objective-C metadata was disabled.

It would also leak if exceptions were thrown or early returns were taken
in the ~500 lines between where the object was allocated and it was
deleted.
diff --git a/objectivec/objc.cpp b/objectivec/objc.cpp
@@ -1713,7 +1713,7 @@ void ObjCProcessor::ProcessCFStrings()
 
 void ObjCProcessor::ProcessNSConstantArrays()
 {
-	m_symbolQueue = new SymbolQueue();
+	auto guard = ScopedSymbolQueue::Make();
 	uint64_t ptrSize = m_data->GetAddressSize();
 
 	auto idType = Type::NamedType(m_data, m_typeNames.id);
@@ -1742,16 +1742,16 @@ void ObjCProcessor::ProcessNSConstantArrays()
 				fmt::format("nsarray_{:x}", i), i, true);
 		}
 		auto id = m_data->BeginUndoActions();
-		m_symbolQueue->Process();
+		ScopedSymbolQueue::Get().Process();
 		m_data->EndBulkModifySymbols();
 		m_data->ForgetUndoActions(id);
 	}
-	delete m_symbolQueue;
+	
 }
 
 void ObjCProcessor::ProcessNSConstantDictionaries()
 {
-	m_symbolQueue = new SymbolQueue();
+	auto guard = ScopedSymbolQueue::Make();
 	uint64_t ptrSize = m_data->GetAddressSize();
 
 	auto idType = Type::NamedType(m_data, m_typeNames.id);
@@ -1786,16 +1786,15 @@ void ObjCProcessor::ProcessNSConstantDictionaries()
 				fmt::format("nsdict_{:x}", i), i, true);
 		}
 		auto id = m_data->BeginUndoActions();
-		m_symbolQueue->Process();
+		ScopedSymbolQueue::Get().Process();
 		m_data->EndBulkModifySymbols();
 		m_data->ForgetUndoActions(id);
 	}
-	delete m_symbolQueue;
 }
 
 void ObjCProcessor::ProcessNSConstantIntegerNumbers()
 {
-	m_symbolQueue = new SymbolQueue();
+	auto guard = ScopedSymbolQueue::Make();
 	uint64_t ptrSize = m_data->GetAddressSize();
 
 	StructureBuilder nsConstantIntegerNumberBuilder;
@@ -1844,11 +1843,10 @@ void ObjCProcessor::ProcessNSConstantIntegerNumbers()
 			}
 		}
 		auto id = m_data->BeginUndoActions();
-		m_symbolQueue->Process();
+		ScopedSymbolQueue::Get().Process();
 		m_data->EndBulkModifySymbols();
 		m_data->ForgetUndoActions(id);
 	}
-	delete m_symbolQueue;
 }
 
 void ObjCProcessor::ProcessNSConstantFloatingPointNumbers()
@@ -1893,7 +1891,7 @@ void ObjCProcessor::ProcessNSConstantFloatingPointNumbers()
 		if (!numbers)
 			continue;
 
-		m_symbolQueue = new SymbolQueue();
+		auto guard = ScopedSymbolQueue::Make();
 		auto start = numbers->GetStart();
 		auto end = numbers->GetEnd();
 		auto typeWidth = Type::NamedType(m_data, m_typeNames.nsConstantDoubleNumber)->GetWidth();
@@ -1935,16 +1933,15 @@ void ObjCProcessor::ProcessNSConstantFloatingPointNumbers()
 			DefineObjCSymbol(DataSymbol, Type::NamedType(m_data, *typeName), name, i, true);
 		}
 		auto id = m_data->BeginUndoActions();
-		m_symbolQueue->Process();
+		ScopedSymbolQueue::Get().Process();
 		m_data->EndBulkModifySymbols();
 		m_data->ForgetUndoActions(id);
-		delete m_symbolQueue;
 	}
 }
 
 void ObjCProcessor::ProcessNSConstantDatas()
 {
-	m_symbolQueue = new SymbolQueue();
+	auto guard = ScopedSymbolQueue::Make();
 	uint64_t ptrSize = m_data->GetAddressSize();
 
 	StructureBuilder nsConstantDataBuilder;
@@ -1972,11 +1969,10 @@ void ObjCProcessor::ProcessNSConstantDatas()
 				DataSymbol, Type::NamedType(m_data, m_typeNames.nsConstantData), fmt::format("nsdata_{:x}", i), i, true);
 		}
 		auto id = m_data->BeginUndoActions();
-		m_symbolQueue->Process();
+		ScopedSymbolQueue::Get().Process();
 		m_data->EndBulkModifySymbols();
 		m_data->ForgetUndoActions(id);
 	}
-	delete m_symbolQueue;
 }
 
 void ObjCProcessor::AddRelocatedPointer(uint64_t location, uint64_t rewrite)
diff --git a/view/macho/machoview.cpp b/view/macho/machoview.cpp
@@ -1856,9 +1856,11 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_
 		parseObjCStructs = false;
 	if (!GetSectionByName("__cfstring"))
 		parseCFStrings = false;
+
+	std::unique_ptr<MachoObjCProcessor> objcProcessor;
 	if (parseObjCStructs || parseCFStrings)
 	{
-		m_objcProcessor = new MachoObjCProcessor(this);
+		objcProcessor = std::make_unique<MachoObjCProcessor>(this);
 	}
 	if (parseObjCStructs)
 	{
@@ -2067,7 +2069,7 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_
 	{
 		// Add functions for all function symbols
 		m_logger->LogDebug("Parsing symbol table\n");
-		ParseSymbolTable(reader, header, header.symtab, indirectSymbols);
+		ParseSymbolTable(reader, header, header.symtab, indirectSymbols, objcProcessor.get());
 	}
 	catch (std::exception&)
 	{
@@ -2088,8 +2090,8 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_
 		uint64_t slidTarget = target + m_imageBaseAdjustment;
 		relocation.address = slidTarget;
 		DefineRelocation(m_arch, relocation, slidTarget, relocationLocation);
-		if (m_objcProcessor)
-			m_objcProcessor->AddRelocatedPointer(relocationLocation, slidTarget);
+		if (objcProcessor)
+			objcProcessor->AddRelocatedPointer(relocationLocation, slidTarget);
 	}
 	for (auto& [relocation, name] : header.externalRelocations)
 	{
@@ -2369,7 +2371,7 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_
 	if (parseCFStrings)
 	{
 		try {
-			m_objcProcessor->ProcessObjCLiterals();
+			objcProcessor->ProcessObjCLiterals();
 		}
 		catch (std::exception& ex)
 		{
@@ -2381,14 +2383,13 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_
 	if (parseObjCStructs)
 	{
 		try {
-			m_objcProcessor->ProcessObjCData();
+			objcProcessor->ProcessObjCData();
 		}
 		catch (std::exception& ex)
 		{
 			m_logger->LogError("Failed to process Objective-C Metadata. Binary may be malformed");
 			m_logger->LogError("Error: %s", ex.what());
 		}
-		delete m_objcProcessor;
 	}
 
 
@@ -2976,7 +2977,8 @@ void MachoView::ParseDynamicTable(BinaryReader& reader, MachOHeader& header, BNS
 }
 
 
-void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, const symtab_command& symtab, const vector<uint32_t>& indirectSymbols)
+void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, const symtab_command& symtab,
+	const vector<uint32_t>& indirectSymbols, MachoObjCProcessor* objcProcessor)
 {
 	if (header.ident.filetype == MH_DSYM)
 	{
@@ -3004,12 +3006,12 @@ void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, cons
 		if (header.chainedFixupsPresent)
 		{
 			m_logger->LogDebug("Chained Fixups");
-			ParseChainedFixups(header, header.chainedFixups);
+			ParseChainedFixups(header, header.chainedFixups, objcProcessor);
 		}
 		else if (header.chainStartsPresent)
 		{
 			m_logger->LogDebug("Chained Starts");
-			ParseChainedStarts(header, header.chainStarts);
+			ParseChainedStarts(header, header.chainStarts, objcProcessor);
 		}
 		if (header.exportTriePresent && header.isMainHeader)
 			ParseExportTrie(reader, header.exportTrie);
@@ -3197,7 +3199,8 @@ void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, cons
 }
 
 
-void MachoView::ParseChainedFixups(MachOHeader& header, linkedit_data_command chainedFixups)
+void MachoView::ParseChainedFixups(
+	MachOHeader& header, linkedit_data_command chainedFixups, MachoObjCProcessor* objcProcessor)
 {
 	if (!chainedFixups.dataoff)
 		return;
@@ -3596,9 +3599,9 @@ void MachoView::ParseChainedFixups(MachOHeader& header, linkedit_data_command ch
 							reloc.address = GetStart() + (chainEntryAddress - m_universalImageOffset);
 							DefineRelocation(m_arch, reloc, entryOffset, reloc.address);
 
-							if (m_objcProcessor)
+							if (objcProcessor)
 							{
-								m_objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);
+								objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);
 							}
 						}
 
@@ -3627,7 +3630,7 @@ void MachoView::ParseChainedFixups(MachOHeader& header, linkedit_data_command ch
 }
 
 
-void MachoView::ParseChainedStarts(MachOHeader& header, section_64 chainedStarts)
+void MachoView::ParseChainedStarts(MachOHeader& header, section_64 chainedStarts, MachoObjCProcessor* objcProcessor)
 {
 	if (!chainedStarts.offset)
 		return;
@@ -3799,9 +3802,9 @@ void MachoView::ParseChainedStarts(MachOHeader& header, section_64 chainedStarts
 					DefineRelocation(m_arch, reloc, entryOffset, reloc.address);
 					m_logger->LogDebug("Chained Starts: Adding relocated pointer %llx -> %llx", reloc.address, entryOffset);
 
-					if (m_objcProcessor)
+					if (objcProcessor)
 					{
-						m_objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);
+						objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);
 					}
 				}
 
diff --git a/view/macho/machoview.h b/view/macho/machoview.h
@@ -1456,8 +1456,6 @@ namespace BinaryNinja
 			QualifiedName filesetEntryCommandQualName;
 		} m_typeNames;
 
-		MachoObjCProcessor* m_objcProcessor = nullptr;
-
 		uint64_t m_universalImageOffset;
 		bool m_parseOnly, m_backedByDatabase;
 		int64_t m_imageBaseAdjustment;
@@ -1488,7 +1486,7 @@ namespace BinaryNinja
 		void RebaseThreadStarts(BinaryReader& virtualReader, std::vector<uint32_t>& threadStarts, uint64_t stepMultiplier);
 		Ref<Symbol> DefineMachoSymbol(
 			BNSymbolType type, const std::string& name, uint64_t addr, BNSymbolBinding binding, bool deferred);
-		void ParseSymbolTable(BinaryReader& reader, MachOHeader& header, const symtab_command& symtab, const std::vector<uint32_t>& symbolStubsList);
+		void ParseSymbolTable(BinaryReader& reader, MachOHeader& header, const symtab_command& symtab, const std::vector<uint32_t>& symbolStubsList, MachoObjCProcessor*);
 		bool IsValidFunctionStart(uint64_t addr);
 		void ParseFunctionStarts(Platform* platform, uint64_t textBase, function_starts_command functionStarts);
 		bool ParseRelocationEntry(const relocation_info& info, uint64_t start, BNRelocationInfo& result);
@@ -1503,8 +1501,8 @@ namespace BinaryNinja
 			BNSymbolBinding binding);
 		bool GetSectionPermissions(MachOHeader& header, uint64_t address, uint32_t &flags);
 		bool GetSegmentPermissions(MachOHeader& header, uint64_t address, uint32_t &flags);
-		void ParseChainedFixups(MachOHeader& header, linkedit_data_command chainedFixups);
-		void ParseChainedStarts(MachOHeader& header, section_64 chainedStarts);
+		void ParseChainedFixups(MachOHeader& header, linkedit_data_command chainedFixups, MachoObjCProcessor*);
+		void ParseChainedStarts(MachOHeader& header, section_64 chainedStarts, MachoObjCProcessor*);
 
 		virtual uint64_t PerformGetEntryPoint() const override;
 

Original file line number	Diff line number	Diff line change
`@@ -1713,7 +1713,7 @@ void ObjCProcessor::ProcessCFStrings()`
`1713`	`1713`
`1714`	`1714`	`void ObjCProcessor::ProcessNSConstantArrays()`
`1715`	`1715`	`{`
`1716`		`- m_symbolQueue = new SymbolQueue();`
	`1716`	`+ auto guard = ScopedSymbolQueue::Make();`
`1717`	`1717`	`uint64_t ptrSize = m_data->GetAddressSize();`
`1718`	`1718`
`1719`	`1719`	`auto idType = Type::NamedType(m_data, m_typeNames.id);`
`@@ -1742,16 +1742,16 @@ void ObjCProcessor::ProcessNSConstantArrays()`
`1742`	`1742`	`fmt::format("nsarray_{:x}", i), i, true);`
`1743`	`1743`	`}`
`1744`	`1744`	`auto id = m_data->BeginUndoActions();`
`1745`		`- m_symbolQueue->Process();`
	`1745`	`+ ScopedSymbolQueue::Get().Process();`
`1746`	`1746`	`m_data->EndBulkModifySymbols();`
`1747`	`1747`	`m_data->ForgetUndoActions(id);`
`1748`	`1748`	`}`
`1749`		`- delete m_symbolQueue;`
	`1749`	`+`
`1750`	`1750`	`}`
`1751`	`1751`
`1752`	`1752`	`void ObjCProcessor::ProcessNSConstantDictionaries()`
`1753`	`1753`	`{`
`1754`		`- m_symbolQueue = new SymbolQueue();`
	`1754`	`+ auto guard = ScopedSymbolQueue::Make();`
`1755`	`1755`	`uint64_t ptrSize = m_data->GetAddressSize();`
`1756`	`1756`
`1757`	`1757`	`auto idType = Type::NamedType(m_data, m_typeNames.id);`
`@@ -1786,16 +1786,15 @@ void ObjCProcessor::ProcessNSConstantDictionaries()`
`1786`	`1786`	`fmt::format("nsdict_{:x}", i), i, true);`
`1787`	`1787`	`}`
`1788`	`1788`	`auto id = m_data->BeginUndoActions();`
`1789`		`- m_symbolQueue->Process();`
	`1789`	`+ ScopedSymbolQueue::Get().Process();`
`1790`	`1790`	`m_data->EndBulkModifySymbols();`
`1791`	`1791`	`m_data->ForgetUndoActions(id);`
`1792`	`1792`	`}`
`1793`		`- delete m_symbolQueue;`
`1794`	`1793`	`}`
`1795`	`1794`
`1796`	`1795`	`void ObjCProcessor::ProcessNSConstantIntegerNumbers()`
`1797`	`1796`	`{`
`1798`		`- m_symbolQueue = new SymbolQueue();`
	`1797`	`+ auto guard = ScopedSymbolQueue::Make();`
`1799`	`1798`	`uint64_t ptrSize = m_data->GetAddressSize();`
`1800`	`1799`
`1801`	`1800`	`StructureBuilder nsConstantIntegerNumberBuilder;`
`@@ -1844,11 +1843,10 @@ void ObjCProcessor::ProcessNSConstantIntegerNumbers()`
`1844`	`1843`	`}`
`1845`	`1844`	`}`
`1846`	`1845`	`auto id = m_data->BeginUndoActions();`
`1847`		`- m_symbolQueue->Process();`
	`1846`	`+ ScopedSymbolQueue::Get().Process();`
`1848`	`1847`	`m_data->EndBulkModifySymbols();`
`1849`	`1848`	`m_data->ForgetUndoActions(id);`
`1850`	`1849`	`}`
`1851`		`- delete m_symbolQueue;`
`1852`	`1850`	`}`
`1853`	`1851`
`1854`	`1852`	`void ObjCProcessor::ProcessNSConstantFloatingPointNumbers()`
`@@ -1893,7 +1891,7 @@ void ObjCProcessor::ProcessNSConstantFloatingPointNumbers()`
`1893`	`1891`	`if (!numbers)`
`1894`	`1892`	`continue;`
`1895`	`1893`
`1896`		`- m_symbolQueue = new SymbolQueue();`
	`1894`	`+ auto guard = ScopedSymbolQueue::Make();`
`1897`	`1895`	`auto start = numbers->GetStart();`
`1898`	`1896`	`auto end = numbers->GetEnd();`
`1899`	`1897`	`auto typeWidth = Type::NamedType(m_data, m_typeNames.nsConstantDoubleNumber)->GetWidth();`
`@@ -1935,16 +1933,15 @@ void ObjCProcessor::ProcessNSConstantFloatingPointNumbers()`
`1935`	`1933`	`DefineObjCSymbol(DataSymbol, Type::NamedType(m_data, *typeName), name, i, true);`
`1936`	`1934`	`}`
`1937`	`1935`	`auto id = m_data->BeginUndoActions();`
`1938`		`- m_symbolQueue->Process();`
	`1936`	`+ ScopedSymbolQueue::Get().Process();`
`1939`	`1937`	`m_data->EndBulkModifySymbols();`
`1940`	`1938`	`m_data->ForgetUndoActions(id);`
`1941`		`- delete m_symbolQueue;`
`1942`	`1939`	`}`
`1943`	`1940`	`}`
`1944`	`1941`
`1945`	`1942`	`void ObjCProcessor::ProcessNSConstantDatas()`
`1946`	`1943`	`{`
`1947`		`- m_symbolQueue = new SymbolQueue();`
	`1944`	`+ auto guard = ScopedSymbolQueue::Make();`
`1948`	`1945`	`uint64_t ptrSize = m_data->GetAddressSize();`
`1949`	`1946`
`1950`	`1947`	`StructureBuilder nsConstantDataBuilder;`
`@@ -1972,11 +1969,10 @@ void ObjCProcessor::ProcessNSConstantDatas()`
`1972`	`1969`	`DataSymbol, Type::NamedType(m_data, m_typeNames.nsConstantData), fmt::format("nsdata_{:x}", i), i, true);`
`1973`	`1970`	`}`
`1974`	`1971`	`auto id = m_data->BeginUndoActions();`
`1975`		`- m_symbolQueue->Process();`
	`1972`	`+ ScopedSymbolQueue::Get().Process();`
`1976`	`1973`	`m_data->EndBulkModifySymbols();`
`1977`	`1974`	`m_data->ForgetUndoActions(id);`
`1978`	`1975`	`}`
`1979`		`- delete m_symbolQueue;`
`1980`	`1976`	`}`
`1981`	`1977`
`1982`	`1978`	`void ObjCProcessor::AddRelocatedPointer(uint64_t location, uint64_t rewrite)`
Original file line number	Diff line number	Diff line change
`@@ -1856,9 +1856,11 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_`
`1856`	`1856`	`parseObjCStructs = false;`
`1857`	`1857`	`if (!GetSectionByName("__cfstring"))`
`1858`	`1858`	`parseCFStrings = false;`
	`1859`	`+`
	`1860`	`+ std::unique_ptr<MachoObjCProcessor> objcProcessor;`
`1859`	`1861`	`if (parseObjCStructs \|\| parseCFStrings)`
`1860`	`1862`	`{`
`1861`		`- m_objcProcessor = new MachoObjCProcessor(this);`
	`1863`	`+ objcProcessor = std::make_unique<MachoObjCProcessor>(this);`
`1862`	`1864`	`}`
`1863`	`1865`	`if (parseObjCStructs)`
`1864`	`1866`	`{`
`@@ -2067,7 +2069,7 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_`
`2067`	`2069`	`{`
`2068`	`2070`	`// Add functions for all function symbols`
`2069`	`2071`	`m_logger->LogDebug("Parsing symbol table\n");`
`2070`		`- ParseSymbolTable(reader, header, header.symtab, indirectSymbols);`
	`2072`	`+ ParseSymbolTable(reader, header, header.symtab, indirectSymbols, objcProcessor.get());`
`2071`	`2073`	`}`
`2072`	`2074`	`catch (std::exception&)`
`2073`	`2075`	`{`
`@@ -2088,8 +2090,8 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_`
`2088`	`2090`	`uint64_t slidTarget = target + m_imageBaseAdjustment;`
`2089`	`2091`	`relocation.address = slidTarget;`
`2090`	`2092`	`DefineRelocation(m_arch, relocation, slidTarget, relocationLocation);`
`2091`		`- if (m_objcProcessor)`
`2092`		`- m_objcProcessor->AddRelocatedPointer(relocationLocation, slidTarget);`
	`2093`	`+ if (objcProcessor)`
	`2094`	`+ objcProcessor->AddRelocatedPointer(relocationLocation, slidTarget);`
`2093`	`2095`	`}`
`2094`	`2096`	`for (auto& [relocation, name] : header.externalRelocations)`
`2095`	`2097`	`{`
`@@ -2369,7 +2371,7 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_`
`2369`	`2371`	`if (parseCFStrings)`
`2370`	`2372`	`{`
`2371`	`2373`	`try {`
`2372`		`- m_objcProcessor->ProcessObjCLiterals();`
	`2374`	`+ objcProcessor->ProcessObjCLiterals();`
`2373`	`2375`	`}`
`2374`	`2376`	`catch (std::exception& ex)`
`2375`	`2377`	`{`
`@@ -2381,14 +2383,13 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_`
`2381`	`2383`	`if (parseObjCStructs)`
`2382`	`2384`	`{`
`2383`	`2385`	`try {`
`2384`		`- m_objcProcessor->ProcessObjCData();`
	`2386`	`+ objcProcessor->ProcessObjCData();`
`2385`	`2387`	`}`
`2386`	`2388`	`catch (std::exception& ex)`
`2387`	`2389`	`{`
`2388`	`2390`	`m_logger->LogError("Failed to process Objective-C Metadata. Binary may be malformed");`
`2389`	`2391`	`m_logger->LogError("Error: %s", ex.what());`
`2390`	`2392`	`}`
`2391`		`- delete m_objcProcessor;`
`2392`	`2393`	`}`
`2393`	`2394`
`2394`	`2395`
`@@ -2976,7 +2977,8 @@ void MachoView::ParseDynamicTable(BinaryReader& reader, MachOHeader& header, BNS`
`2976`	`2977`	`}`
`2977`	`2978`
`2978`	`2979`
`2979`		`-void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, const symtab_command& symtab, const vector<uint32_t>& indirectSymbols)`
	`2980`	`+void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, const symtab_command& symtab,`
	`2981`	`+ const vector<uint32_t>& indirectSymbols, MachoObjCProcessor* objcProcessor)`
`2980`	`2982`	`{`
`2981`	`2983`	`if (header.ident.filetype == MH_DSYM)`
`2982`	`2984`	`{`
`@@ -3004,12 +3006,12 @@ void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, cons`
`3004`	`3006`	`if (header.chainedFixupsPresent)`
`3005`	`3007`	`{`
`3006`	`3008`	`m_logger->LogDebug("Chained Fixups");`
`3007`		`- ParseChainedFixups(header, header.chainedFixups);`
	`3009`	`+ ParseChainedFixups(header, header.chainedFixups, objcProcessor);`
`3008`	`3010`	`}`
`3009`	`3011`	`else if (header.chainStartsPresent)`
`3010`	`3012`	`{`
`3011`	`3013`	`m_logger->LogDebug("Chained Starts");`
`3012`		`- ParseChainedStarts(header, header.chainStarts);`
	`3014`	`+ ParseChainedStarts(header, header.chainStarts, objcProcessor);`
`3013`	`3015`	`}`
`3014`	`3016`	`if (header.exportTriePresent && header.isMainHeader)`
`3015`	`3017`	`ParseExportTrie(reader, header.exportTrie);`
`@@ -3197,7 +3199,8 @@ void MachoView::ParseSymbolTable(BinaryReader& reader, MachOHeader& header, cons`
`3197`	`3199`	`}`
`3198`	`3200`
`3199`	`3201`
`3200`		`-void MachoView::ParseChainedFixups(MachOHeader& header, linkedit_data_command chainedFixups)`
	`3202`	`+void MachoView::ParseChainedFixups(`
	`3203`	`+ MachOHeader& header, linkedit_data_command chainedFixups, MachoObjCProcessor* objcProcessor)`
`3201`	`3204`	`{`
`3202`	`3205`	`if (!chainedFixups.dataoff)`
`3203`	`3206`	`return;`
`@@ -3596,9 +3599,9 @@ void MachoView::ParseChainedFixups(MachOHeader& header, linkedit_data_command ch`
`3596`	`3599`	`reloc.address = GetStart() + (chainEntryAddress - m_universalImageOffset);`
`3597`	`3600`	`DefineRelocation(m_arch, reloc, entryOffset, reloc.address);`
`3598`	`3601`
`3599`		`- if (m_objcProcessor)`
	`3602`	`+ if (objcProcessor)`
`3600`	`3603`	`{`
`3601`		`- m_objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);`
	`3604`	`+ objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);`
`3602`	`3605`	`}`
`3603`	`3606`	`}`
`3604`	`3607`
`@@ -3627,7 +3630,7 @@ void MachoView::ParseChainedFixups(MachOHeader& header, linkedit_data_command ch`
`3627`	`3630`	`}`
`3628`	`3631`
`3629`	`3632`
`3630`		`-void MachoView::ParseChainedStarts(MachOHeader& header, section_64 chainedStarts)`
	`3633`	`+void MachoView::ParseChainedStarts(MachOHeader& header, section_64 chainedStarts, MachoObjCProcessor* objcProcessor)`
`3631`	`3634`	`{`
`3632`	`3635`	`if (!chainedStarts.offset)`
`3633`	`3636`	`return;`
`@@ -3799,9 +3802,9 @@ void MachoView::ParseChainedStarts(MachOHeader& header, section_64 chainedStarts`
`3799`	`3802`	`DefineRelocation(m_arch, reloc, entryOffset, reloc.address);`
`3800`	`3803`	`m_logger->LogDebug("Chained Starts: Adding relocated pointer %llx -> %llx", reloc.address, entryOffset);`
`3801`	`3804`
`3802`		`- if (m_objcProcessor)`
	`3805`	`+ if (objcProcessor)`
`3803`	`3806`	`{`
`3804`		`- m_objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);`
	`3807`	`+ objcProcessor->AddRelocatedPointer(reloc.address, entryOffset);`
`3805`	`3808`	`}`
`3806`	`3809`	`}`
`3807`	`3810`