generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memory leaks in BIO_dup_chain()

Browse Source 
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: Stephen Henson <steve@openssl.org>

Conflicts:
	crypto/bio/bio_lib.c
This commit is contained in:
Matt Caswell 2015-04-30 14:51:10 +01:00
parent e94118ae2a
commit f92b196723
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/bio/bio_lib.c
View File

@ -536,8 +536,10 @@ BIO *BIO_dup_chain(BIO *in)
/* copy app data */ /* copy app data */
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_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; goto err;
}
if (ret == NULL) { if (ret == NULL) {
eoc = new_bio; eoc = new_bio;
@ -549,8 +551,8 @@ BIO *BIO_dup_chain(BIO *in)
} }
return (ret); return (ret);
err: err:
if (ret != NULL) BIO_free_all(ret);
BIO_free(ret);
return (NULL); return (NULL);
} }