[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  33a23fa6afe355304e02b7abb96acdbc5fc6c5c2 (commit)
      from  b427401cb68ff06f56d43a04b998d401945f3628 (commit)


- Log -----------------------------------------------------------------
commit 33a23fa6afe355304e02b7abb96acdbc5fc6c5c2
Author: mrpre <mrpre at 163.com>
Date:   Tue Sep 1 20:42:06 2015 +0800

    free item after sk_push fail
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/tasn_dec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 595c5e4..0e0759f 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -623,6 +623,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
             len -= p - q;
             if (!sk_ASN1_VALUE_push((STACK_OF(ASN1_VALUE) *)*val, skfield)) {
                 ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I, ERR_R_MALLOC_FAILURE);
+                ASN1_item_free(skfield, ASN1_ITEM_ptr(tt->item));
                 goto err;
             }
         }