Commit 9d725c0a authored by Richard Levitte's avatar Richard Levitte
Browse files

asn1_item_embed_new(): if locking failed, don't call asn1_item_embed_free() 



asn1_item_embed_free() will try unlocking and fail in this case, and
since the new item was just allocated on the heap, free it directly
with OPENSSL_free() instead.

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/4579)

(cherry picked from commit fe6fcd31)
parent f7f1ac6c

crypto/asn1/tasn_new.c

+7 −2
Original line number Diff line number Diff line
@@ -124,8 +124,13 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed) 
                goto memerr;

        }

        /* 0 : init. lock */

        if (asn1_do_lock(pval, 0, it) < 0)

            goto memerr2;

        if (asn1_do_lock(pval, 0, it) < 0) {

            if (!embed) {

                OPENSSL_free(*pval);

                *pval = NULL;

            }

            goto memerr;

        }

        asn1_enc_init(pval, it);

        for (i = 0, tt = it->templates; i < it->tcount; tt++, i++) {

            pseqval = asn1_get_field_ptr(pval, tt);