From b0b6ba2d11ce4188e32be50c9e87672c67183616 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 27 Apr 2016 12:52:29 +0100 Subject: [PATCH] Don't leak memory on failure to create a mem BIO During construction of a mem BIO we allocate some resources. If this allocation fails we can end up leaking everything we have allocated so far. Reviewed-by: Richard Levitte --- crypto/bio/bss_mem.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 46bd0343d5..3b6f1734ad 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -150,17 +150,22 @@ static int mem_init(BIO *bi, unsigned long flags) BIO_BUF_MEM *bb = OPENSSL_zalloc(sizeof(*bb)); if (bb == NULL) - return(0); - if ((bb->buf = BUF_MEM_new_ex(flags)) == NULL) - return(0); - if ((bb->readp = OPENSSL_zalloc(sizeof(*bb->readp))) == NULL) - return(0); + return 0; + if ((bb->buf = BUF_MEM_new_ex(flags)) == NULL) { + OPENSSL_free(bb); + return 0; + } + if ((bb->readp = OPENSSL_zalloc(sizeof(*bb->readp))) == NULL) { + BUF_MEM_free(bb->buf); + OPENSSL_free(bb); + return 0; + } *bb->readp = *bb->buf; bi->shutdown = 1; bi->init = 1; bi->num = -1; bi->ptr = (char *)bb; - return(1); + return 1; } static int mem_new(BIO *bi) -- 2.25.1