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_0_2h~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b93479fcfd335622bb9e5e8cc08acd328750f44;p=oweals%2Fopenssl.git

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 d9ba99d735..0e7a262a0d 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -3415,8 +3415,10 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
     p = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx);
     eticklen -= 16 + EVP_CIPHER_CTX_iv_length(&ctx);
     sdec = OPENSSL_malloc(eticklen);
-    if (!sdec || EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen) <= 0) {
+    if (sdec == NULL
+            || EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen) <= 0) {
         EVP_CIPHER_CTX_cleanup(&ctx);
+        OPENSSL_free(sdec);
         return -1;
     }
     if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen) <= 0) {