update

Author: arandomdev

bin/dyldex

@@ -162,7 +162,7 @@ def _extractImage(
 		extractionCtx = ExtractionContext(dyldCtx, machoCtx, statusBar, logger)
 
 		slide_info.processSlideInfo(extractionCtx)
-		# linkedit_optimizer.optimizeLinkedit(extractionCtx)
+		linkedit_optimizer.optimizeLinkedit(extractionCtx)
 		# stub_fixer.fixStubs(extractionCtx)
 		# objc_fixer.fixObjC(extractionCtx)
 

src/DyldExtractor/converter/linkedit_optimizer.py

@@ -76,6 +76,10 @@ def __init__(self, extractionCtx: ExtractionContext) -> None:
 		self.statusBar = extractionCtx.statusBar
 		self.logger = extractionCtx.logger
 
+		self.linkeditFile = self.machoCtx.fileForAddr(
+			self.machoCtx.segments[b"__LINKEDIT"].seg.vmaddr
+		)
+
 		self.symTabCmd: symtab_command = None
 		self.dynSymTabCmd: dysymtab_command = None
 		self.dyldInfo: dyld_info_command = None
@@ -134,7 +138,10 @@ def copyWeakBindingInfo(self, newLinkedit: bytearray) -> None:
 
 		size = self.dyldInfo.weak_bind_size
 		if size:
-			weakBindingInfo = self.machoCtx.getBytes(self.dyldInfo.weak_bind_off, size)
+			weakBindingInfo = self.linkeditFile.getBytes(
+				self.dyldInfo.weak_bind_off,
+				size
+			)
 
 			self.newWeakBindingInfoOffset = len(newLinkedit)
 			newLinkedit.extend(weakBindingInfo)
@@ -156,7 +163,7 @@ def copyExportInfo(self, newLinkedit: bytearray) -> None:
 			exportSize = self.dyldInfo.export_size
 
 		if exportSize:
-			exportInfo = self.machoCtx.getBytes(exportOff, exportSize)
+			exportInfo = self.linkeditFile.getBytes(exportOff, exportSize)
 
 			self.newExportInfoOffset = len(newLinkedit)
 			newLinkedit.extend(exportInfo)
@@ -172,7 +179,7 @@ def copyBindingInfo(self, newLinkedit: bytearray) -> None:
 
 		size = self.dyldInfo.bind_size
 		if size:
-			bindingInfo = self.machoCtx.getBytes(self.dyldInfo.bind_off, size)
+			bindingInfo = self.linkeditFile.getBytes(self.dyldInfo.bind_off, size)
 
 			self.newBindingInfoOffset = len(newLinkedit)
 			newLinkedit.extend(bindingInfo)
@@ -188,7 +195,10 @@ def copyLazyBindingInfo(self, newLinkedit: bytearray) -> None:
 
 		size = self.dyldInfo.lazy_bind_size
 		if size:
-			lazyBindingInfo = self.machoCtx.getBytes(self.dyldInfo.lazy_bind_off, size)
+			lazyBindingInfo = self.linkeditFile.getBytes(
+				self.dyldInfo.lazy_bind_off,
+				size
+			)
 
 			self.newLazyBindingInfoOffset = len(newLinkedit)
 			newLinkedit.extend(lazyBindingInfo)
@@ -204,17 +214,18 @@ def startSymbolContext(self, newLinkedit: bytearray) -> None:
 	def copyLocalSymbols(self, newLinkedit: bytearray) -> None:
 		self.statusBar.update(status="Copy Local Symbols")
 
+		symbolsCache = self.dyldCtx.getSymbolsCache()
 		localSymbolsInfo = dyld_cache_local_symbols_info(
-			self.dyldCtx.file,
-			self.dyldCtx.header.localSymbolsOffset
+			symbolsCache.fileCtx.file,
+			symbolsCache.header.localSymbolsOffset
 		)
 
 		localSymbolsEntriesInfo = None
 		for i in range(localSymbolsInfo.entriesCount):
 			entryOff = (i * dyld_cache_local_symbols_entry.SIZE)
 			entryOff += localSymbolsInfo._fileOff_ + localSymbolsInfo.entriesOffset
 
-			entry = dyld_cache_local_symbols_entry(self.dyldCtx.file, entryOff)
+			entry = dyld_cache_local_symbols_entry(symbolsCache.fileCtx.file, entryOff)
 			if entry.dylibOffset == self.machoCtx.fileOffset:
 				localSymbolsEntriesInfo = entry
 				break
@@ -241,7 +252,7 @@ def copyLocalSymbols(self, newLinkedit: bytearray) -> None:
 
 		for offset in range(entriesStart, entriesEnd, nlist_64.SIZE):
 			symbolEnt = nlist_64(self.dyldCtx.file, offset)
-			name = self.dyldCtx.readString(symbolStrOff + symbolEnt.n_strx)
+			name = symbolsCache.fileCtx.readString(symbolStrOff + symbolEnt.n_strx)
 
 			# copy data
 			self.newLocalSymbolCount += 1

src/DyldExtractor/dyld/dyld_context.py

@@ -109,3 +109,21 @@ def addSubCaches(self, subCacheFileCtxs: list[FileContext]) -> None:
 			self.mappings.extend(subCache.mappings)
 			pass
 		pass
+
+	def getSymbolsCache(self) -> "DyldContext":
+		"""Get the .symbols cache.
+
+		Try to find the .symbols cache by matching uuids.
+		If there are no sub caches, this just returns itself.
+		Or None if the .symbols cache cannot be found.
+		"""
+
+		if not self._subCaches:
+			return self
+
+		for cache in self._subCaches:
+			if self.header.symbolSubCacheUUID == cache.header.uuid:
+				return cache
+			pass
+
+		return None