Prevent accessing of global c++ objects once they are deleted

Fixes (Maybe) softhsm#729. Reset objects_deleted after reset is called.
Emantor · Mar 13, 2024 · 6c5ec8d · 6c5ec8d
1 parent 913e7bf
commit 6c5ec8d
Show file tree

Hide file tree

Showing 2 changed files with 143 additions and 0 deletions.
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
@@ -89,6 +89,8 @@
 
 // Initialise the one-and-only instance
 
+int objects_deleted = 0;
+
 #ifdef HAVE_CXX11
 
 std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
@@ -406,6 +408,8 @@ void SoftHSM::reset()
 {
 	if (instance.get())
 		instance.reset();
+
+	objects_deleted = 0;
 }
 
 // Constructor
@@ -445,6 +449,7 @@ SoftHSM::~SoftHSM()
 
 	isInitialised = false;
 
+	objects_deleted = 1;
 	resetMutexFactoryCallbacks();
 }