From e8eb224b8cd2b6dc29843eab01227eab00fcf774 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 1 Dec 2016 10:20:59 +0000 Subject: [PATCH] Ensure compressdata is always initialised Reviewed-by: Rich Salz --- ssl/record/rec_layer_s3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- 2.25.1