From: Pauli <paul.dale@oracle.com>
Date: Fri, 14 Jul 2017 00:08:38 +0000 (+1000)
Subject: Address Coverity issues.
X-Git-Tag: OpenSSL_1_1_1-pre1~1031
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20e237c025acd9edb58df87f21c47753ac02b68f;p=openssl

Address Coverity issues.

This patch addresses the use of uninitialised data raised in Coverity
issues 1414881 and 1414882.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3929)
---

diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index 67facdc88c..6584e4db1e 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -1319,6 +1319,8 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     memset(&client_ctx_data, 0, sizeof(client_ctx_data));
     memset(&server, 0, sizeof(server));
     memset(&client, 0, sizeof(client));
+    memset(&server_ex_data, 0, sizeof(server_ex_data));
+    memset(&client_ex_data, 0, sizeof(client_ex_data));
 
     if (!configure_handshake_ctx(server_ctx, server2_ctx, client_ctx,
                                  test_ctx, extra, &server_ctx_data,
@@ -1348,9 +1350,6 @@ static HANDSHAKE_RESULT *do_handshake_internal(
             goto err;
     }
 
-    memset(&server_ex_data, 0, sizeof(server_ex_data));
-    memset(&client_ex_data, 0, sizeof(client_ex_data));
-
     ret->result = SSL_TEST_INTERNAL_ERROR;
 
     if (test_ctx->use_sctp) {