diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-10-23 16:48:17 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-10-23 17:44:30 +0200 |
| commit | cdc3307d4257f4fcebbab3b2b44207e1a399da05 (patch) | |
| tree | d25607350d957bb90f0675971920648b75c7eeb1 | |
| parent | 8c6101781a47cb33a5ccba50b8abfe2b6ab42c03 (diff) | |
asn1_item_embed_new(): don't free an embedded item
An embedded item wasn't allocated separately on the heap, so don't
free it as if it was.
Issue discovered by Pavel Kopyl
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4571)
| -rw-r--r-- | crypto/asn1/tasn_new.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c index 54f459d1ed..1e21da216b 100644 --- a/crypto/asn1/tasn_new.c +++ b/crypto/asn1/tasn_new.c @@ -199,7 +199,8 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, return 1; memerr2: - ASN1_item_ex_free(pval, it); + if (!combine) + ASN1_item_ex_free(pval, it); memerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ERR_R_MALLOC_FAILURE); #ifdef CRYPTO_MDEBUG @@ -209,7 +210,8 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, return 0; auxerr2: - ASN1_item_ex_free(pval, it); + if (!combine) + ASN1_item_ex_free(pval, it); auxerr: ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ASN1_R_AUX_ERROR); #ifdef CRYPTO_MDEBUG |