diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-10-23 16:41:06 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-10-23 17:15:40 +0200 |
| commit | 590bbdfdf43b97abf8817f506f8ab46687d1eadd (patch) | |
| tree | 4fd0bab176d1142b99aab72900171f90cf3a70d6 | |
| parent | c9fe362303fc54ff19bde7511475f28663f7d554 (diff) | |
| download | openssl-590bbdfdf43b97abf8817f506f8ab46687d1eadd.tar.gz | |
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/4572)
| -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 f695e38da0..7608b43b7f 100644 --- a/crypto/asn1/tasn_new.c +++ b/crypto/asn1/tasn_new.c @@ -142,7 +142,8 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed) return 1; memerr2: - ASN1_item_ex_free(pval, it); + if (!embed) + ASN1_item_ex_free(pval, it); memerr: ASN1err(ASN1_F_ASN1_ITEM_EMBED_NEW, ERR_R_MALLOC_FAILURE); #ifndef OPENSSL_NO_CRYPTO_MDEBUG @@ -151,7 +152,8 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed) return 0; auxerr2: - ASN1_item_ex_free(pval, it); + if (!embed) + ASN1_item_ex_free(pval, it); auxerr: ASN1err(ASN1_F_ASN1_ITEM_EMBED_NEW, ASN1_R_AUX_ERROR); #ifndef OPENSSL_NO_CRYPTO_MDEBUG |