[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  493e78986f9677c2b321273da51c276b9a8182d8 (commit)
      from  0cfbc828e03ad69c50ae51e0c88920d90906498a (commit)


- Log -----------------------------------------------------------------
commit 493e78986f9677c2b321273da51c276b9a8182d8
Author: Nan Xiao <nan at chinadtrace.org>
Date:   Thu Apr 1 13:55:04 2021 +0800

    Fix potential double free in sslapitest.c
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14758)

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

Summary of changes:
 test/sslapitest.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 3e5d532bf4..31b36b23b1 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -2743,8 +2743,10 @@ static int execute_test_ssl_bio(int pop_ssl, bio_change_t change_bio)
 
     /* Verify changing the rbio/wbio directly does not cause leaks */
     if (change_bio != NO_BIO_CHANGE) {
-        if (!TEST_ptr(membio2 = BIO_new(BIO_s_mem())))
+        if (!TEST_ptr(membio2 = BIO_new(BIO_s_mem()))) {
+            ssl = NULL;
             goto end;
+        }
         if (change_bio == CHANGE_RBIO)
             SSL_set0_rbio(ssl, membio2);
         else