projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure compressdata is always initialised
[openssl.git]
/
ssl
/
record
/
rec_layer_s3.c
diff --git
a/ssl/record/rec_layer_s3.c
b/ssl/record/rec_layer_s3.c
index 8adb3cdd08e6cc3d8544c4f0a2af95f37d4d534f..d588e784bded834b2ad83e3d91d04abdae72e377 100644
(file)
--- 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;
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;
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;
&& !s->renegotiate && TLS1_get_version(s) > TLS1_VERSION)
version = TLS1_VERSION;
- maxcomplen = pipelens[j] + (s
sl_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)
? SSL3_RT_MAX_COMPRESSED_OVERHEAD : 0);
/* write the header */
if (!WPACKET_put_bytes_u8(&pkt[j], rectype)