[SharedCache] Fix project folder comparison crash

Fixes https://github.com/Vector35/binaryninja-api/issues/6629

3 files changed, 13 insertions, 3 deletions

diff --git a/view/sharedcache/core/SharedCacheBuilder.cpp b/view/sharedcache/core/SharedCacheBuilder.cpp
index 5c3ea0d8..ac2990fa 100644
--- a/view/sharedcache/core/SharedCacheBuilder.cpp
+++ b/view/sharedcache/core/SharedCacheBuilder.cpp
@@ -83,9 +83,8 @@ size_t SharedCacheBuilder::AddProjectFolder(Ref<ProjectFolder> folder)
 		const auto currentFileName = file.GetName();
 
 		// Skip files not in the folder.
-		if (const auto currentFolder = file.GetFolder(); folder)
-			if (currentFolder->GetId() != folder->GetId())
-				return false;
+		if (!IsSameFolder(file.GetFolder(), folder))
+			return false;
 
 		// Ok, we are now _sure_ that this file _might_ be a part of the cache, lets try and process it!
 		return AddFile(currentFilePath, currentFileName, CacheEntryType::Secondary);
diff --git a/view/sharedcache/core/Utility.cpp b/view/sharedcache/core/Utility.cpp
index 583770e6..0cffc03e 100644
--- a/view/sharedcache/core/Utility.cpp
+++ b/view/sharedcache/core/Utility.cpp
@@ -136,3 +136,12 @@ std::string BaseFileName(const std::string& path)
 		return path.substr(lastSlashPos + 1);
 	return path;
 }
+
+bool IsSameFolder(Ref<ProjectFolder> a, Ref<ProjectFolder> b)
+{
+	if (!a && !b)
+		return true;
+	if (a && b)
+		return a->GetId() == b->GetId();
+	return false;
+}
diff --git a/view/sharedcache/core/Utility.h b/view/sharedcache/core/Utility.h
index af242bb6..81c3b583 100644
--- a/view/sharedcache/core/Utility.h
+++ b/view/sharedcache/core/Utility.h
@@ -40,6 +40,8 @@ void ApplySymbol(BinaryNinja::Ref<BinaryNinja::BinaryView> view, BinaryNinja::Re
 // /blah/foo/bar/libObjCThing.dylib -> libObjCThing.dylib
 std::string BaseFileName(const std::string& path);
 
+bool IsSameFolder(BinaryNinja::Ref<BinaryNinja::ProjectFolder> a, BinaryNinja::Ref<BinaryNinja::ProjectFolder> b);
+
 // Represents a range of addresses [start, end).
 // Note that `end` is not included within the range.
 struct AddressRange