From: Peiwei Hu <jlu.hpw@foxmail.com>
Date: Thu, 23 Jun 2022 15:59:50 +0000 (+0800)
Subject: crypto/provider_core.c: Avoid calling unlock two times
X-Git-Tag: openssl-3.2.0-alpha1~2466
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61f510600e2c7cdee6e61f8b7075fb0e939eb179;p=thirdparty%2Fopenssl.git

crypto/provider_core.c: Avoid calling unlock two times

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18641)
---

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 072e29e0237..6f82b298355 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -641,7 +641,7 @@ int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
         if (!ossl_provider_up_ref(actualtmp)) {
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE);
             actualtmp = NULL;
-            goto err;
+            return 0;
         }
         *actualprov = actualtmp;
     }
@@ -665,8 +665,6 @@ int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
 
  err:
     CRYPTO_THREAD_unlock(store->lock);
-    if (actualprov != NULL)
-        ossl_provider_free(*actualprov);
     return 0;
 }