Ensure compressdata is always initialised
authorMatt Caswell <matt@openssl.org>
Thu, 1 Dec 2016 10:20:59 +0000 (10:20 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 5 Dec 2016 17:05:40 +0000 (17:05 +0000)
Reviewed-by: Rich Salz <rsalz@openssl.org>
ssl/record/rec_layer_s3.c

index 8adb3cd..d588e78 100644 (file)
@@ -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)