Commit b3c02473 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix memory leaks in BIO_dup_chain() 



This fixes a memory leak that can occur whilst duplicating a BIO chain if
the call to CRYPTO_dup_ex_data() fails. It also fixes a second memory leak
where if a failure occurs after successfully creating the first BIO in the
chain, then the beginning of the new chain was not freed.

With thanks to the Open Crypto Audit Project for reporting this issue.

Reviewed-by: default avatarStephen Henson <steve@openssl.org>

Conflicts:
	crypto/bio/bio_lib.c
parent 23cd01ef

crypto/bio/bio_lib.c

+5 −3
Original line number Diff line number Diff line
@@ -536,8 +536,10 @@ BIO *BIO_dup_chain(BIO *in) 


        /* copy app data */

        if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_data,

                                &bio->ex_data))

                                &bio->ex_data)) {

            BIO_free(new_bio);

            goto err;

        }



        if (ret == NULL) {

            eoc = new_bio;
@@ -549,8 +551,8 @@ BIO *BIO_dup_chain(BIO *in) 
    }

    return (ret);

 err:

    if (ret != NULL)

        BIO_free(ret);

    BIO_free_all(ret);



    return (NULL);

}