wip

Author: emesare

view/sharedcache/core/SharedCacheController.cpp

@@ -144,29 +144,24 @@ bool SharedCacheController::IsRegionLoaded(const CacheRegion &region) const
 
 bool SharedCacheController::LoadImage(BinaryView& view, const CacheImage& image)
 {
-    view.BeginBulkAddSegments();
     // TODO: Check m_loadedImages? This seems redundant...
     // TODO: Will this load the header for the image as well?
     // Load all regions of an image and mark the image as loaded.
     bool loadedRegion = false;
     for (const auto& regionStart : image.regionStarts)
         if (LoadRegionAtAddress(view, regionStart))
             loadedRegion = true;
-    view.EndBulkAddSegments();
 
     // If there was no loaded regions than we just want to forgo loading the image.
     if (!loadedRegion)
         return false;
 
     // TODO: This is at the entry level, we must have some accessor on the file that can do this for us.
-    auto base = m_cache.GetBaseAddress();
     auto entry = m_cache.GetEntryWithImage(image);
     if (!entry.has_value())
         return false;
 
-    view.BeginBulkModifySymbols();
-
-    SlideInfoProcessor slideInfoProcessor = SlideInfoProcessor(base);
+    SlideInfoProcessor slideInfoProcessor = SlideInfoProcessor(m_cache.GetBaseAddress());
     slideInfoProcessor.ProcessEntryInfo(*entry);
 
     if (image.header)
@@ -184,8 +179,6 @@ bool SharedCacheController::LoadImage(BinaryView& view, const CacheImage& image)
         objcProcessor.ProcessCFStrings(image.GetName());
     }
 
-    view.EndBulkModifySymbols();
-
     m_loadedImages.insert(image.headerAddress);
 
     // TODO: Partial failure state (i.e. 2 regions loaded, one failed)

view/sharedcache/core/ffi.cpp

@@ -371,11 +371,9 @@ extern "C" {
 		auto entries = controller->object->GetCache().GetEntries();
 		*count = entries.size();
 		BNSharedCacheEntry* apiEntries = new BNSharedCacheEntry[*count];
-		for (size_t i = 0; i < *count; i++)
-		{
-			auto b = entries[i];
-			apiEntries[i] = EntryToApi(b);
-		}
+		size_t idx = 0;
+		for (const auto &[_, entry]: entries)
+			apiEntries[idx++] = EntryToApi(entry);
 		return apiEntries;
 	}
 

view/sharedcache/ui/SharedCacheUINotifications.cpp

@@ -21,7 +21,6 @@ void UINotifications::init()
 	UIContext::registerNotification(m_instance);
 }
 
-
 void UINotifications::OnViewChange(UIContext* context, ViewFrame* frame, const QString& type)
 {
 	if (!frame)
@@ -40,31 +39,31 @@ void UINotifications::OnViewChange(UIContext* context, ViewFrame* frame, const Q
 	if (ah->isBoundAction("Load Image by Name"))
 		return;
 
-	static auto loadRegionAtAddr = [view](uint64_t addr) {
-		auto controller = SharedCacheController::GetController(*view);
+	static auto loadRegionAtAddr = [](BinaryView& view, uint64_t addr) {
+		auto controller = SharedCacheController::GetController(view);
 		if (!controller)
 			return;
 		if (auto foundRegion = controller->GetRegionContaining(addr))
 		{
 			// If we did not load the region, then we don't need to run analysis.
-			if (!controller->LoadRegion(*view, *foundRegion))
+			if (!controller->LoadRegion(view, *foundRegion))
 				return;
-			view->AddAnalysisOption("linearsweep");
-			view->UpdateAnalysis();
+			view.AddAnalysisOption("linearsweep");
+			view.UpdateAnalysis();
 		}
 	};
 
-	static auto loadImageAtAddr = [view](uint64_t addr) {
-		auto controller = SharedCacheController::GetController(*view);
+	static auto loadImageAtAddr = [](BinaryView& view, uint64_t addr) {
+		auto controller = SharedCacheController::GetController(view);
 		if (!controller)
 			return;
 		if (auto foundImage = controller->GetImageContaining(addr))
 		{
 			// If we did not load the image, then we don't need to run analysis.
-			if (!controller->LoadImage(*view, *foundImage))
+			if (!controller->LoadImage(view, *foundImage))
 				return;
-			view->AddAnalysisOption("linearsweep");
-			view->UpdateAnalysis();
+			view.AddAnalysisOption("linearsweep");
+			view.UpdateAnalysis();
 		}
 	};
 
@@ -77,20 +76,20 @@ void UINotifications::OnViewChange(UIContext* context, ViewFrame* frame, const Q
 		if (GetAddressInput(addr, "Address", "Address"))
 		{
 			BackgroundThread::create(ctx.context->mainWindow())
-				->thenBackground([addr](){ loadRegionAtAddr(addr); })
+				->thenBackground([ctx, addr](){ loadRegionAtAddr(*ctx.binaryView, addr); })
 				->start();
 		}
 	};
 
 	auto loadRegionTokenAction = [](const UIActionContext& ctx) {
 		BackgroundThread::create(ctx.context->mainWindow())
-			->thenBackground([ctx](){ loadRegionAtAddr(ctx.token.token.value); })
+			->thenBackground([ctx](){ loadRegionAtAddr(*ctx.binaryView, ctx.token.token.value); })
 			->start();
 	};
 
 	auto loadImageTokenAction = [](const UIActionContext& ctx) {
 		BackgroundThread::create(ctx.context->mainWindow())
-			->thenBackground([ctx](){ loadImageAtAddr(ctx.token.token.value); })
+			->thenBackground([ctx](){ loadImageAtAddr(*ctx.binaryView, ctx.token.token.value); })
 			->start();
 	};
 

view/sharedcache/ui/dsctriage.cpp

@@ -77,9 +77,6 @@ DSCTriageView::DSCTriageView(QWidget* parent, BinaryViewRef data) : QWidget(pare
 			const std::string initialLoad = fmt::format("Loading images... (0/{})", images.size());
 			auto imageLoadTask = BackgroundTask(initialLoad, true);
 
-			// this->getData()->BeginBulkAddSegments();
-			this->getData()->BeginBulkModifySymbols();
-
 			for (const auto& [addr, image] : images)
 			{
 				if (imageLoadTask.IsCancelled())
@@ -91,9 +88,6 @@ DSCTriageView::DSCTriageView(QWidget* parent, BinaryViewRef data) : QWidget(pare
 			}
 			imageLoadTask.Finish();
 
-			// this->getData()->EndBulkAddSegments();
-			this->getData()->EndBulkModifySymbols();
-
 			// We have loaded images, lets make sure to update analysis!
 			this->m_data->AddAnalysisOption("linearsweep");
 			this->m_data->UpdateAnalysis();