From: Matt Caswell <matt@openssl.org>
Date: Tue, 15 Mar 2016 11:38:56 +0000 (+0000)
Subject: Ensure that memory allocated for the ticket is freed
X-Git-Tag: OpenSSL_1_1_0-pre5~329
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=d1247df266130561c9f1ab46a905ab04888ef6d9

Ensure that memory allocated for the ticket is freed

If a call to EVP_DecryptUpdate fails then a memory leak could occur.
Ensure that the memory is freed appropriately.

Issue reported by Guido Vranken.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 8f5342b39f..fc7ebe41ca 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3162,6 +3162,7 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
     if (sdec == NULL
             || EVP_DecryptUpdate(ctx, sdec, &slen, p, eticklen) <= 0) {
         EVP_CIPHER_CTX_free(ctx);
+        OPENSSL_free(sdec);
         return -1;
     }
     if (EVP_DecryptFinal(ctx, sdec + slen, &mlen) <= 0) {