From 39dc10a43093f650736ce5f35b7cb936b73fe9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sat, 9 Jul 2022 12:48:48 +0200
Subject: [PATCH] Construct and destruct CutterCore singleton locally (Fix
 #2704) (#2994)

Using Q_GLOBAL_STATIC meant that the CutterCore was destructed late as
part of a binary destructor. It would then free the RzCore, calling for
example the fini callbacks of all plugins. However global destructors in
shared library plugins may have already been run at this point, leading
to for example rz-ghidra's decompiler_mutex being used after
destruction.
Instead of the Q_GLOBAL_STATIC-managed global object, we are now
handling the lifetime of the CutterCore ourselves and only injecting its
instance to be accessed globally. This can also be a first step towards
making the core instance completely local.
---
 src/CutterApplication.h | 1 +
 src/core/Cutter.cpp     | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/CutterApplication.h b/src/CutterApplication.h
index f8dc01e3..cd27a26a 100644
--- a/src/CutterApplication.h
+++ b/src/CutterApplication.h
@@ -50,6 +50,7 @@ private:
 
 private:
     bool m_FileAlreadyDropped;
+    CutterCore core;
     MainWindow *mainWindow;
     CutterCommandLineOptions clOptions;
 };
diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp
index 76397be8..490e363b 100644
--- a/src/core/Cutter.cpp
+++ b/src/core/Cutter.cpp
@@ -24,7 +24,7 @@
 #include <rz_cmd.h>
 #include <sdb.h>
 
-Q_GLOBAL_STATIC(CutterCore, uniqueInstance)
+static CutterCore *uniqueInstance;
 
 #define RZ_JSON_KEY(name) static const QString name = QStringLiteral(#name)
 
@@ -182,6 +182,10 @@ CutterCore::CutterCore(QObject *parent)
       coreMutex(QMutex::Recursive)
 #endif
 {
+    if (uniqueInstance) {
+        throw std::logic_error("Only one instance of CutterCore must exist");
+    }
+    uniqueInstance = this;
 }
 
 CutterCore *CutterCore::instance()
@@ -238,6 +242,8 @@ CutterCore::~CutterCore()
     rz_core_task_sync_end(&core_->tasks);
     rz_core_free(this->core_);
     rz_cons_free();
+    assert(uniqueInstance == this);
+    uniqueInstance = nullptr;
 }
 
 RzCoreLocked CutterCore::core()