Merge pull request softhsm#519 from opendnssec/fix_issue_518

Fix issue softhsm#518 by locking before the object set is accessed
middagj · Mar 3, 2020 · 9100ce6 · 9100ce6
2 parents 0ad0f7b + 2446047
commit 9100ce6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lib/object_store/SessionObjectStore.cpp b/src/lib/object_store/SessionObjectStore.cpp
@@ -122,15 +122,15 @@ SessionObject* SessionObjectStore::createObject(CK_SLOT_ID slotID, CK_SESSION_HA
 // Delete an object
 bool SessionObjectStore::deleteObject(SessionObject* object)
 {
+	MutexLocker lock(storeMutex);
+
 	if (objects.find(object) == objects.end())
 	{
 		ERROR_MSG("Cannot delete non-existent object 0x%08X", object);
 
 		return false;
 	}
 
-	MutexLocker lock(storeMutex);
-
 	// Invalidate the object instance
 	object->invalidate();