Avoid NULL deref on BIO_new{_mem_buf,}() failure.

2 files changed, 11 insertions, 7 deletions

diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c
index be9ebc1d30..51b23986fd 100644
--- a/src/regress/lib/libssl/client/clienttest.c
+++ b/src/regress/lib/libssl/client/clienttest.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: clienttest.c,v 1.26 2020/11/19 09:35:50 tb Exp $ */
+/*      $OpenBSD: clienttest.c,v 1.27 2021/01/22 15:54:32 tb Exp $ */
 /*
  * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
  *
@@ -456,8 +456,10 @@ client_hello_test(int testno, struct client_hello_test *cht)
         SSL_CTX_free(ssl_ctx);
         SSL_free(ssl);
 
-        rbio->references = 1;
-        wbio->references = 1;
+        if (rbio != NULL)
+                rbio->references = 1;
+        if (wbio != NULL)
+                wbio->references = 1;
 
         BIO_free(rbio);
         BIO_free(wbio);
diff --git a/src/regress/lib/libssl/server/servertest.c b/src/regress/lib/libssl/server/servertest.c
index d6f2039af1..a71c5f8c66 100644
--- a/src/regress/lib/libssl/server/servertest.c
+++ b/src/regress/lib/libssl/server/servertest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servertest.c,v 1.4 2020/10/11 02:30:04 jsing Exp $ */
+/* $OpenBSD: servertest.c,v 1.5 2021/01/22 15:56:17 tb Exp $ */
 /*
  * Copyright (c) 2015, 2016, 2017 Joel Sing <jsing@openbsd.org>
  *
@@ -159,7 +159,7 @@ server_hello_test(int testno, struct server_hello_test *sht)
         wbio->references = 2;
 
         SSL_set_bio(ssl, rbio, wbio);
-        
+
         if (SSL_accept(ssl) != 0) {
                 fprintf(stderr, "SSL_accept() returned non-zero\n");
                 ERR_print_errors_fp(stderr);
@@ -172,8 +172,10 @@ server_hello_test(int testno, struct server_hello_test *sht)
         SSL_CTX_free(ssl_ctx);
         SSL_free(ssl);
 
-        rbio->references = 1;
-        wbio->references = 1;
+        if (rbio != NULL)
+                rbio->references = 1;
+        if (wbio != NULL)
+                wbio->references = 1;
 
         BIO_free(rbio);
         BIO_free(wbio);