forked from pool/openssl
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
|
From 9c8dc84ac16a2f21063ae36809d202d0284ecf82 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ben Laurie <ben@links.org>
|
||
|
|
Date: Tue, 22 Apr 2014 13:11:56 +0100
|
||
|
|
Subject: [PATCH 09/17] Fix double frees.
|
||
|
|
|
||
|
|
---
|
||
|
|
CHANGES | 3 ++-
|
||
|
|
crypto/pkcs7/pk7_doit.c | 1 +
|
||
|
|
crypto/ts/ts_rsp_verify.c | 1 +
|
||
|
|
ssl/d1_srvr.c | 1 +
|
||
|
|
4 files changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
|
||
|
|
index 77fda3b..4c12a9d 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 afe16af..b7d170a 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 = NULL;
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
|
||
|
|
index 9975e20..1384ab0 100644
|
||
|
|
--- a/ssl/d1_srvr.c
|
||
|
|
+++ b/ssl/d1_srvr.c
|
||
|
|
@@ -1356,6 +1356,7 @@ int dtls1_send_server_key_exchange(SSL *s)
|
||
|
|
(unsigned char *)encodedPoint,
|
||
|
|
encodedlen);
|
||
|
|
OPENSSL_free(encodedPoint);
|
||
|
|
+ encodedPoint = NULL;
|
||
|
|
p += encodedlen;
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|