Commit 66ce2861 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't free ret->data if malloc fails. 



Issue reported by Guido Vranken.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit 64eaf6c9)
parent 1c81a595

crypto/asn1/a_bytes.c

+2 −2
Original line number Diff line number Diff line
@@ -200,13 +200,13 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp, 
    } else {

        if (len != 0) {

            if ((ret->length < len) || (ret->data == NULL)) {

                if (ret->data != NULL)

                    OPENSSL_free(ret->data);

                s = (unsigned char *)OPENSSL_malloc((int)len + 1);

                if (s == NULL) {

                    i = ERR_R_MALLOC_FAILURE;

                    goto err;

                }

                if (ret->data != NULL)

                    OPENSSL_free(ret->data);

            } else

                s = ret->data;

            memcpy(s, p, (int)len);