From dcd9cc4f62138ef94c6c496fc214045f44e62d4d Mon Sep 17 00:00:00 2001
From: Josh Ferrell <josh@vector35.com>
Date: Thu, 30 May 2024 22:20:36 -0400
Subject: Fix crash in AnalysisMergeConflict::GetPathItem

---
 binaryninjaapi.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'binaryninjaapi.h')

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index bb243e52..b5ce7010 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -18409,13 +18409,18 @@ namespace BinaryNinja::Collaboration
 		Ref<Snapshot> GetFirstSnapshot();
 		Ref<Snapshot> GetSecondSnapshot();
 
-		std::any GetPathItem(const std::string& path);
+		template<typename T> T GetPathItem(const std::string& key);
 
 		bool Success(std::nullopt_t value);
 		bool Success(std::optional<const nlohmann::json*> value);
 		bool Success(const std::optional<nlohmann::json>& value);
 	};
 
+	template<> std::any AnalysisMergeConflict::GetPathItem<std::any>(const std::string& path);
+	template<> std::string AnalysisMergeConflict::GetPathItem<std::string>(const std::string& path);
+	template<> uint64_t AnalysisMergeConflict::GetPathItem<uint64_t>(const std::string& path);
+	template<> nlohmann::json AnalysisMergeConflict::GetPathItem<nlohmann::json>(const std::string& path);
+
 	class TypeArchiveMergeConflict : public CoreRefCountObject<BNTypeArchiveMergeConflict, BNNewTypeArchiveMergeConflictReference, BNFreeTypeArchiveMergeConflict>
 	{
 	public:
-- 
cgit v1.3.1