Skip to content

Commit 7455379

Browse files
nhormanEmantor
authored andcommitted
Prevent accessing of global c++ objects once they are deleted
Fixes (Maybe) softhsm#729. Reset objects_deleted after reset is called.
1 parent 0053e2b commit 7455379

File tree

2 files changed

+143
-0
lines changed

2 files changed

+143
-0
lines changed

src/lib/SoftHSM.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
#include <unistd.h>
8888
#endif
8989

90+
int objects_deleted = 0;
91+
9092
// Initialise the one-and-only instance
9193

9294
#ifdef HAVE_CXX11
@@ -406,6 +408,8 @@ void SoftHSM::reset()
406408
{
407409
if (instance.get())
408410
instance.reset();
411+
412+
objects_deleted = 0;
409413
}
410414

411415
// Constructor
@@ -445,6 +449,7 @@ SoftHSM::~SoftHSM()
445449

446450
isInitialised = false;
447451

452+
objects_deleted = 1;
448453
resetMutexFactoryCallbacks();
449454
}
450455

0 commit comments

Comments
 (0)