Fix double frees.

Conflicts:
	CHANGES
This commit is contained in:
Ben Laurie 2014-04-22 12:38:26 +01:00
parent 5aeb43393b
commit 3b21abfd6c
3 changed files with 5 additions and 0 deletions

View File

@ -4,6 +4,9 @@
Changes between 1.0.1g and 1.0.2 [xx XXX xxxx]
*) Fix some double frees. These are not thought to be exploitable.
[mancha <mancha1@zoho.com>]
*) Use algorithm specific chains in SSL_CTX_use_certificate_chain_file():
this fixes a limiation in previous versions of OpenSSL.
[Steve Henson]

View File

@ -928,6 +928,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
if (EVP_DigestSignUpdate(&mctx,abuf,alen) <= 0)
goto err;
OPENSSL_free(abuf);
abuf = NULL;
if (EVP_DigestSignFinal(&mctx, NULL, &siglen) <= 0)
goto err;
abuf = OPENSSL_malloc(siglen);

View File

@ -629,6 +629,7 @@ static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
X509_ALGOR_free(*md_alg);
OPENSSL_free(*imprint);
*imprint_len = 0;
*imprint = 0;
return 0;
}