From eae2bb2f1f5347c0bd305026fd3c222e0ccd69e2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 12 Dec 2014 11:05:21 +0000 Subject: [PATCH] Fix memory leak in s2_srvr.c if BUF_MEM_grow fails Reviewed-by: Tim Hudson Reviewed-by: Kurt Roeckx (cherry picked from commit d04a1e0b5beb3329cdf8c4ec35b9113cbc41d2f2) --- ssl/s2_srvr.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index bc885e8e7f..73a54dc157 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -188,13 +188,21 @@ int ssl2_accept(SSL *s) s->version=SSL2_VERSION; s->type=SSL_ST_ACCEPT; - buf=s->init_buf; - if ((buf == NULL) && ((buf=BUF_MEM_new()) == NULL)) - { ret= -1; goto end; } - if (!BUF_MEM_grow(buf,(int) - SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER)) - { ret= -1; goto end; } - s->init_buf=buf; + if(s->init_buf == NULL) + { + if ((buf=BUF_MEM_new()) == NULL) + { + ret= -1; + goto end; + } + if (!BUF_MEM_grow(buf,(int) SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER)) + { + BUF_MEM_free(buf); + ret= -1; + goto end; + } + s->init_buf=buf; + } s->init_num=0; s->ctx->stats.sess_accept++; s->handshake_func=ssl2_accept; -- 2.34.1