[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  bfe2fcc840e92df5a5875e55c6aed79891d2612f (commit)
      from  6ef2f71ac70aff99da277be4a554e3b1fe739050 (commit)


- Log -----------------------------------------------------------------
commit bfe2fcc840e92df5a5875e55c6aed79891d2612f
Author: Tomas Mraz <tomas at openssl.org>
Date:   Tue May 4 15:38:48 2021 +0200

    evp_extra_test: Avoid potential double free of params
    
    Fixes #14916
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15135)

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

Summary of changes:
 test/evp_extra_test.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index f8fdc7287d..7fd45bc316 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -688,6 +688,7 @@ static int test_EC_priv_pub(void)
     if (!test_fromdata("EC", params))
         goto err;
     OSSL_PARAM_free(params);
+    params = NULL;
     OSSL_PARAM_BLD_free(bld);
 
     /* Test priv and !pub */
@@ -704,6 +705,7 @@ static int test_EC_priv_pub(void)
     if (!test_fromdata("EC", params))
         goto err;
     OSSL_PARAM_free(params);
+    params = NULL;
     OSSL_PARAM_BLD_free(bld);
 
     /* Test !priv and pub */
@@ -721,6 +723,7 @@ static int test_EC_priv_pub(void)
     if (!test_fromdata("EC", params))
         goto err;
     OSSL_PARAM_free(params);
+    params = NULL;
     OSSL_PARAM_BLD_free(bld);
 
     /* Test priv and pub */