From bf3e9ddbc54ec6cccf4fb99aecbd0e99706a3d76 Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 22 Jan 2021 15:56:17 +0000 Subject: [PATCH] Avoid NULL deref on BIO_new{_mem_buf,}() failure. --- regress/lib/libssl/server/servertest.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/regress/lib/libssl/server/servertest.c b/regress/lib/libssl/server/servertest.c index d6f2039af12..a71c5f8c664 100644 --- a/regress/lib/libssl/server/servertest.c +++ b/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 * @@ -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); -- 2.20.1