wip

Author: emesare

view/sharedcache/api/python/sharedcache.py

@@ -113,6 +113,10 @@ def __init__(self, view: BinaryView):
         """
         self.handle = sccore.BNGetSharedCacheController(view.handle)
 
+    def __del__(self):
+        if self.handle is not None:
+            sccore.BNFreeSharedCacheControllerReference(self.handle)
+
     def __str__(self):
         return repr(self)
 

view/sharedcache/core/MachO.cpp

@@ -593,7 +593,7 @@ std::optional<CacheSymbol> SharedCacheMachOHeader::AddExportTerminalSymbol(const
 	case EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE:
 		return CacheSymbol(DataSymbol, symbolAddress, symbolName);
 	default:
-		LogWarn("Unhandled export symbol kind: %x", symbolFlags & EXPORT_SYMBOL_FLAGS_KIND_MASK);
+		LogWarn("Unhandled export symbol kind: %llx", symbolFlags & EXPORT_SYMBOL_FLAGS_KIND_MASK);
 		return std::nullopt;
 	}
 }

view/sharedcache/core/SlideInfo.cpp

@@ -235,7 +235,7 @@ std::vector<SlideMappingInfo> SlideInfoProcessor::ReadEntryInfo(VirtualMemory& v
 		map.slideInfoVersion = vm.ReadUInt32(map.address);
 		map.mappingInfo.address = mappingAndSlideInfo.address;
 		map.mappingInfo.size = mappingAndSlideInfo.size;
-		map.mappingInfo.fileOffset = mappingAndSlideInfo.fileOffset;
+		map.mappingInfo.fileOffset = *entry.GetMappedAddress(mappingAndSlideInfo.fileOffset);
 		if (map.slideInfoVersion == 2)
 		{
 			vm.Read(&map.slideInfoV2, map.address, sizeof(dyld_cache_slide_info_v2));
@@ -257,10 +257,10 @@ std::vector<SlideMappingInfo> SlideInfoProcessor::ReadEntryInfo(VirtualMemory& v
 		}
 
 		mappings.emplace_back(map);
-		m_logger->LogInfo("File: %s", entry.GetFilePath().c_str());
-		m_logger->LogInfo("Slide Info Address: 0x%llx", map.address);
-		m_logger->LogInfo("Mapping Address: 0x%llx", map.mappingInfo.address);
-		m_logger->LogInfo("Slide Info Version: %d", map.slideInfoVersion);
+		m_logger->LogDebug("File: %s", entry.GetFilePath().c_str());
+		m_logger->LogDebug("Slide Info Address: 0x%llx", map.address);
+		m_logger->LogDebug("Mapping Address: 0x%llx", map.mappingInfo.address);
+		m_logger->LogDebug("Slide Info Version: %d", map.slideInfoVersion);
 	}
 
 	return mappings;
@@ -299,6 +299,6 @@ void SlideInfoProcessor::ProcessEntry(VirtualMemory& vm, const CacheEntry &entry
 	{
 		// Just log an error, we technically can continue as if the slide info is not applied for a given entry it does not
 		// necessarily mean we cannot do analysis on others.
-		m_logger->LogError("Error processing slide info: %s", e.what());
+		m_logger->LogError("Error processing slide info for entry `%s`: %s", entry.GetFileName().c_str(), e.what());
 	}
 }