From 9882fcfb1b66830a1502627d932902a2137dda56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Piniesj=C3=B6?= <anders@piniesjo.se>
Date: Tue, 12 Mar 2024 20:46:41 +0100
Subject: [PATCH] Decrement ref counter only once on key object free

---
 src/p11_key.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/p11_key.c b/src/p11_key.c
index 25e50f32..2aef1762 100644
--- a/src/p11_key.c
+++ b/src/p11_key.c
@@ -185,8 +185,6 @@ void pkcs11_object_free(PKCS11_OBJECT_private *obj)
 	if(!obj)
 		return;
 
-	if (pkcs11_atomic_add(&obj->refcnt, -1, &obj->lock) != 0)
-		return;
 	if (obj->evp_key) {
 		/* When the EVP object is reference count goes to zero,
 		 * it will call this function again. */
@@ -195,6 +193,10 @@ void pkcs11_object_free(PKCS11_OBJECT_private *obj)
 		EVP_PKEY_free(pkey);
 		return;
 	}
+
+	if (pkcs11_atomic_add(&obj->refcnt, -1, &obj->lock) != 0)
+		return;
+
 	pkcs11_slot_unref(obj->slot);
 	X509_free(obj->x509);
 	OPENSSL_free(obj->label);