diff options
| author | Josh Ferrell <josh@vector35.com> | 2024-05-30 22:20:36 -0400 |
|---|---|---|
| committer | Josh Ferrell <josh@vector35.com> | 2024-06-04 13:29:16 -0400 |
| commit | dcd9cc4f62138ef94c6c496fc214045f44e62d4d (patch) | |
| tree | 5fa9e6bcd63256b87ac342e1cbef61a1b540a6a0 /binaryninjaapi.h | |
| parent | ba88ba867035e7cd32ac967075d6e4df0dcb18d3 (diff) | |
Fix crash in AnalysisMergeConflict::GetPathItem
Diffstat (limited to 'binaryninjaapi.h')
| -rw-r--r-- | binaryninjaapi.h | 7 |
1 files changed, 6 insertions, 1 deletions
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: |