From 3b21abfd6c985dc04415893c8ec287676cbd5b5d Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Tue, 22 Apr 2014 12:38:26 +0100 Subject: [PATCH] Fix double frees. Conflicts: CHANGES --- CHANGES | 3 +++ crypto/pkcs7/pk7_doit.c | 1 + crypto/ts/ts_rsp_verify.c | 1 + 3 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index c63fa17b9d..d9205e53b2 100644 --- a/CHANGES +++ b/CHANGES @@ -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 ] + *) Use algorithm specific chains in SSL_CTX_use_certificate_chain_file(): this fixes a limiation in previous versions of OpenSSL. [Steve Henson] diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 77fda3b82a..4c12a9dcc9 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -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); diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index afe16afbe4..3c7f816d12 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -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; } -- 2.25.1