From bf8e7047aa888bdba4a89fd0d03862ebec2d302c Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 9 Dec 2013 16:45:44 +0100 Subject: [PATCH] ssl3_digest_cached_records: check for NULL after allocating s->s3->handshake_dgst Signed-off-by: Kurt Roeckx Reviewed-by: Matt Caswell --- ssl/s3_enc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index f7de30ba4d..66f5280179 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -616,6 +616,11 @@ int ssl3_digest_cached_records(SSL *s) /* Allocate handshake_dgst array */ ssl3_free_digest_list(s); s->s3->handshake_dgst = OPENSSL_malloc(SSL_MAX_DIGEST * sizeof(EVP_MD_CTX *)); + if (s->s3->handshake_dgst == NULL) + { + SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, ERR_R_MALLOC_FAILURE); + return 0; + } memset(s->s3->handshake_dgst,0,SSL_MAX_DIGEST *sizeof(EVP_MD_CTX *)); hdatalen = BIO_get_mem_data(s->s3->handshake_buffer,&hdata); if (hdatalen <= 0) -- 2.25.1