Commit 65d41443 authored by Richard Levitte's avatar Richard Levitte
Browse files

asn1_item_embed_new(): don't free an embedded item 



The previous change with this intention didn't quite do it.  An
embedded item must not be freed itself, but might potentially contain
non-embedded elements, which must be freed.

So instead of calling ASN1_item_ex_free(), where we can't pass the
combine flag, we call asn1_item_embed_free() directly.

This changes asn1_item_embed_free() from being a static function to
being a private non-static function.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/4578)
parent deee898e

crypto/asn1/asn1_int.h

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/* asn1t.h */

/*

 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project

 * 2006.

 */

/* ====================================================================

 * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    licensing@OpenSSL.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



/* Internal ASN1 template structures and functions: not for application use */



void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,

                            int combine);

crypto/asn1/tasn_fre.c

+2 −5
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ 
#include <openssl/asn1.h>

#include <openssl/asn1t.h>

#include <openssl/objects.h>



static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,

                                   int combine);

#include "asn1_int.h"



/* Free up an ASN1 structure */
@@ -77,8 +75,7 @@ void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it) 
    asn1_item_combine_free(pval, it, 0);

}



static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,

                                   int combine)

void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine)

{

    const ASN1_TEMPLATE *tt = NULL, *seqtt;

    const ASN1_EXTERN_FUNCS *ef;

crypto/asn1/tasn_new.c

+3 −4
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include <openssl/err.h>

#include <openssl/asn1t.h>

#include <string.h>

#include "asn1_int.h"



static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it,

                                    int combine);
@@ -199,8 +200,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, 
    return 1;



 memerr2:

    if (!combine)

        ASN1_item_ex_free(pval, it);

    asn1_item_combine_free(pval, it, combine);

 memerr:

    ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ERR_R_MALLOC_FAILURE);

#ifdef CRYPTO_MDEBUG
@@ -210,8 +210,7 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, 
    return 0;



 auxerr2:

    if (!combine)

        ASN1_item_ex_free(pval, it);

    asn1_item_combine_free(pval, it, combine);

 auxerr:

    ASN1err(ASN1_F_ASN1_ITEM_EX_COMBINE_NEW, ASN1_R_AUX_ERROR);

#ifdef CRYPTO_MDEBUG