Catch exceptions during analysis, info handling

Resolves: https://github.com/jonpalmisc/ObjectiveNinja/issues/36
jonpalmisc · Feb 16, 2022 · b983689 · b983689
1 parent c969911
commit b983689
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/Plugin/Commands.cpp b/Plugin/Commands.cpp
@@ -28,12 +28,17 @@ void Commands::analyzeStructures(BinaryViewRef bv)
         return;
     }
 
+    SharedAnalysisInfo info;
     CustomTypes::defineAll(bv);
 
-    auto file = std::make_shared<ObjectiveNinja::BinaryViewFile>(bv);
-    auto info = ObjectiveNinja::AnalysisProvider::infoForFile(file);
+    try {
+        auto file = std::make_shared<ObjectiveNinja::BinaryViewFile>(bv);
+        info = ObjectiveNinja::AnalysisProvider::infoForFile(file);
 
-    InfoHandler::applyInfoToView(info, bv);
+        InfoHandler::applyInfoToView(info, bv);
+    } catch (...) {
+        BinaryNinja::LogError("[Objective Ninja]: Error during analysis. Please report this bug!");
+    }
 
     GlobalState::setFlag(bv, Flag::DidRunWorkflow);
 }

diff --git a/Plugin/Workflow/Workflow.cpp b/Plugin/Workflow/Workflow.cpp
@@ -144,12 +144,17 @@ void Workflow::inlineMethodCalls(AnalysisContextRef ac)
         std::scoped_lock<std::mutex> lock(g_initialAnalysisMutex);
 
         if (!GlobalState::hasAnalysisInfo(bv)) {
+            SharedAnalysisInfo info;
             CustomTypes::defineAll(bv);
 
-            auto file = std::make_shared<ObjectiveNinja::BinaryViewFile>(bv);
-            auto info = ObjectiveNinja::AnalysisProvider::infoForFile(file);
+            try {
+                auto file = std::make_shared<ObjectiveNinja::BinaryViewFile>(bv);
+                info = ObjectiveNinja::AnalysisProvider::infoForFile(file);
 
-            InfoHandler::applyInfoToView(info, bv);
+                InfoHandler::applyInfoToView(info, bv);
+            } catch (...) {
+                BinaryNinja::LogError("[Objective Ninja]: Error during analysis. Please report this bug!");
+            }
 
             GlobalState::setFlag(bv, Flag::DidRunStructureAnalysis);
             GlobalState::storeAnalysisInfo(bv, info);