[openssl] OpenSSL_1_1_1-stable update

[Dr. Paul Dale]

The branch OpenSSL_1_1_1-stable has been updated
       via  b84c0eaeda471affdb4771fd9ea655b701a44217 (commit)
      from  46dc0bca6cd623c42489c57e62c69cf568335664 (commit)


- Log -----------------------------------------------------------------
commit b84c0eaeda471affdb4771fd9ea655b701a44217
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)
    
    (cherry picked from commit 493e78986f9677c2b321273da51c276b9a8182d8)

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

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 4a27ee1ba2..665aa13c23 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -1826,8 +1826,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