From: Emilia Kasper <emilia@openssl.org>
Date: Thu, 15 Oct 2015 11:27:55 +0000 (+0200)
Subject: Appease gcc's Wmaybe-uninitialized
X-Git-Tag: OpenSSL_1_1_0-pre1~423
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bbafa47b554fa2c89cf944951c170bbe21edf469;p=oweals%2Fopenssl.git

Appease gcc's Wmaybe-uninitialized

False positive: gcc (4.8) can't figure out the SSL_IS_DTLS logic.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index ca11c6e8b3..7bf5828ad3 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -883,6 +883,7 @@ int ssl3_get_client_hello(SSL *s)
 
     is_v2_record = RECORD_LAYER_is_sslv2_record(&s->rlayer);
 
+    PACKET_null_init(&cookie);
     /* First lets get s->client_version set correctly */
     if (is_v2_record) {
         unsigned int version;
@@ -1052,8 +1053,6 @@ int ssl3_get_client_hello(SSL *s)
 
         PACKET_null_init(&compression);
         PACKET_null_init(&extensions);
-        /* We're never DTLS here but just play safe and initialize. */
-        PACKET_null_init(&cookie);
     } else {
         /* Regular ClientHello. */
         if (!PACKET_copy_bytes(&pkt, s->s3->client_random, SSL3_RANDOM_SIZE)