Fix crashes on file close when analysis is still running

3 files changed, 11 insertions, 0 deletions

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index ce400e38..d94e7ca7 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -365,6 +365,7 @@ namespace BinaryNinja
 		void AddFunctionForAnalysis(Architecture* arch, uint64_t addr);
 		void AddEntryPointForAnalysis(Architecture* arch, uint64_t start);
 		void UpdateAnalysis();
+		void AbortAnalysis();
 
 		std::vector<Ref<Function>> GetAnalysisFunctionList();
 		Ref<Function> GetAnalysisFunction(Architecture* arch, uint64_t addr);
diff --git a/binaryview.cpp b/binaryview.cpp
index 6a218730..d274acb7 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -330,6 +330,12 @@ void BinaryView::UpdateAnalysis()
 }
 
 
+void BinaryView::AbortAnalysis()
+{
+	BNAbortAnalysis(m_view);
+}
+
+
 vector<Ref<Function>> BinaryView::GetAnalysisFunctionList()
 {
 	size_t count;
diff --git a/functiongraph.cpp b/functiongraph.cpp
index 405046ea..4e48e3cf 100644
--- a/functiongraph.cpp
+++ b/functiongraph.cpp
@@ -11,6 +11,10 @@ FunctionGraph::FunctionGraph(BNFunctionGraph* graph): m_graph(graph)
 
 FunctionGraph::~FunctionGraph()
 {
+	// This object is going away, so ensure that any pending completion routines are
+	// no longer called
+	ClearOnComplete();
+
 	BNFreeFunctionGraph(m_graph);
 }