From: Nachel72 <Nachel72@outlook.com>
Date: Fri, 8 Aug 2025 11:40:46 +0000 (+0800)
Subject: crypto\cms\cms_kem.c: Add ASN1_TYPE_free when EVP_CIPHER_param_to_asn1() fails
X-Git-Tag: openssl-3.6.0-alpha1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb295aa65c1e78f2ef50e3a911f00bd9735cd702;p=thirdparty%2Fopenssl.git

crypto\cms\cms_kem.c: Add ASN1_TYPE_free when EVP_CIPHER_param_to_asn1() fails

Signed-off-by: Nachel72 <Nachel72@outlook.com>

CLA: trivial

Reviewed-by: Hugo Landau <hlandau@devever.net>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/28210)
---

diff --git a/crypto/cms/cms_kem.c b/crypto/cms/cms_kem.c
index ac698099e14..198a4dab3c2 100644
--- a/crypto/cms/cms_kem.c
+++ b/crypto/cms/cms_kem.c
@@ -135,8 +135,11 @@ static int kem_cms_encrypt(CMS_RecipientInfo *ri)
     wrap->parameter = ASN1_TYPE_new();
     if (wrap->parameter == NULL)
         goto err;
-    if (EVP_CIPHER_param_to_asn1(kekctx, wrap->parameter) <= 0)
+    if (EVP_CIPHER_param_to_asn1(kekctx, wrap->parameter) <= 0) {
+        ASN1_TYPE_free(wrap->parameter);
+        wrap->parameter = NULL;
         goto err;
+    }
     if (ASN1_TYPE_get(wrap->parameter) == NID_undef) {
         ASN1_TYPE_free(wrap->parameter);
         wrap->parameter = NULL;