From efd4f1dfd30a5894a1f663c832e287da608c3290 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 9 Jul 2014 23:29:17 +0100 Subject: [PATCH] Fix memory leak in BIO_free if there is no destroy function. Based on an original patch by Neitrino Photonov PR#3439 (cherry picked from commit 66816c53bea0ecddb9448da7ea9a51a334496127) --- crypto/bio/bio_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c index 9c9646afa8..4793a453e4 100644 --- a/crypto/bio/bio_lib.c +++ b/crypto/bio/bio_lib.c @@ -132,8 +132,8 @@ int BIO_free(BIO *a) CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data); - if ((a->method == NULL) || (a->method->destroy == NULL)) return(1); - a->method->destroy(a); + if ((a->method != NULL) && (a->method->destroy != NULL)) + a->method->destroy(a); OPENSSL_free(a); return(1); } -- 2.34.1