From: Matt Caswell <matt@openssl.org>
Date: Thu, 1 Dec 2016 10:20:59 +0000 (+0000)
Subject: Ensure compressdata is always initialised
X-Git-Tag: OpenSSL_1_1_1-pre1~2930
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e8eb224b8cd2b6dc29843eab01227eab00fcf774;p=oweals%2Fopenssl.git

Ensure compressdata is always initialised

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 8adb3cdd08..d588e784bd 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -788,7 +788,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
     memset(wr, 0, sizeof wr);
     for (j = 0; j < numpipes; j++) {
         unsigned int version = s->version;
-        unsigned char *compressdata;
+        unsigned char *compressdata = NULL;
         size_t maxcomplen;
         unsigned int rectype;
 
@@ -809,7 +809,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
             && !s->renegotiate && TLS1_get_version(s) > TLS1_VERSION)
             version = TLS1_VERSION;
 
-        maxcomplen = pipelens[j] + (ssl_allow_compression(s)
+        maxcomplen = pipelens[j] + (s->compress != NULL
                                     ? SSL3_RT_MAX_COMPRESSED_OVERHEAD : 0);
         /* write the header */
         if (!WPACKET_put_bytes_u8(&pkt[j], rectype)