[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  20e237c025acd9edb58df87f21c47753ac02b68f (commit)
      from  d212b98b36d0874eb39c5ef08a18a43b9b006142 (commit)


- Log -----------------------------------------------------------------
commit 20e237c025acd9edb58df87f21c47753ac02b68f
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Jul 14 10:08:38 2017 +1000

    Address Coverity issues.
    
    This patch addresses the use of uninitialised data raised in Coverity
    issues 1414881 and 1414882.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3929)

-----------------------------------------------------------------------

Summary of changes:
 test/handshake_helper.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index 67facdc..6584e4d 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) {