Fix crash when utilizing the Obj-C Plugin on Apple Silicon

Vector35 · Jan 27, 2023 · b5a1359 · b5a1359
1 parent d1cc1b6
commit b5a1359
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Plugin.cpp b/Plugin.cpp
@@ -9,6 +9,7 @@
 #include "Constants.h"
 #include "DataRenderers.h"
 #include "Workflow.h"
+#include "ArchitectureHooks.h"
 
 extern "C" {
 
@@ -23,6 +24,18 @@ BINARYNINJAPLUGIN bool CorePluginInit()
     Workflow::registerActivities();
     Commands::registerCommands();
 
+    std::vector<BinaryNinja::Ref<BinaryNinja::Architecture>> targets = {
+        BinaryNinja::Architecture::GetByName("aarch64"),
+        BinaryNinja::Architecture::GetByName("x86_64")
+    };
+    for (auto& target : targets) {
+        if (target)
+        {
+            auto* currentHook = new CFStringArchitectureHook(target);
+            target->Register(currentHook);
+        }
+    }
+
     BinaryNinja::LogRegistry::CreateLogger(PluginLoggerName);
 
     return true;

diff --git a/Workflow.cpp b/Workflow.cpp
@@ -136,8 +136,6 @@ void Workflow::inlineMethodCalls(AnalysisContextRef ac)
         if (!GlobalState::hasAnalysisInfo(bv)) {
             SharedAnalysisInfo info;
             CustomTypes::defineAll(bv);
-            CFStringArchitectureHook* currentHook = new CFStringArchitectureHook(bv->GetDefaultArchitecture());
-            bv->GetDefaultArchitecture()->Register(currentHook);
             auto messageHandler = GlobalState::messageHandler(bv);
 
             try {