root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fixes some memory leaks when errors occur in ossl_cmp_rp_new(). 

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26235)
This commit is contained in:
Frederik Wedel-Heinen 2024-12-21 15:32:32 +01:00 committed by Tomas Mraz
parent 95a3662626
commit 35b97122ea
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crypto/cmp/cmp_msg.c
View File

@ -593,23 +593,20 @@ OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
goto err;
rep = msg->body->value.rp;
if ((si1 = OSSL_CMP_PKISI_dup(si)) == NULL)
if ((si1 = OSSL_CMP_PKISI_dup(si)) == NULL
|| !sk_OSSL_CMP_PKISI_push(rep->status, si1))
goto err;
if (!sk_OSSL_CMP_PKISI_push(rep->status, si1)) {
OSSL_CMP_PKISI_free(si1);
goto err;
}
si1 = NULL; /* ownership transferred to rep->status */
if ((rep->revCerts = sk_OSSL_CRMF_CERTID_new_null()) == NULL)
goto err;
if (cid != NULL) {
if ((cid_copy = OSSL_CRMF_CERTID_dup(cid)) == NULL)
if ((cid_copy = OSSL_CRMF_CERTID_dup(cid)) == NULL
|| !sk_OSSL_CRMF_CERTID_push(rep->revCerts, cid_copy))
goto err;
if (!sk_OSSL_CRMF_CERTID_push(rep->revCerts, cid_copy)) {
OSSL_CRMF_CERTID_free(cid_copy);
goto err;
}
cid_copy = NULL; /* ownership transferred to rep->revCerts */
}
if (!unprotectedErrors
@ -621,6 +618,8 @@ OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
err:
ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_RP);
OSSL_CMP_PKISI_free(si1);
OSSL_CRMF_CERTID_free(cid_copy);
OSSL_CMP_MSG_free(msg);
return NULL;
}