From: Matt Caswell <matt@openssl.org>
Date: Wed, 6 Sep 2023 11:14:33 +0000 (+0100)
Subject: Add a missing call to BIO_closesocket()
X-Git-Tag: openssl-3.2.0-alpha2~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdedecd50351a3624b074e6a425d8dfb3af5fa6a;p=thirdparty%2Fopenssl.git

Add a missing call to BIO_closesocket()

A couple of the demos missed a call to this function in an error case.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21950)
---

diff --git a/demos/guide/quic-client-block.c b/demos/guide/quic-client-block.c
index b63012829f1..2c177b4f187 100644
--- a/demos/guide/quic-client-block.c
+++ b/demos/guide/quic-client-block.c
@@ -66,6 +66,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
 
         /* Set to nonblocking mode */
         if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
             sock = -1;
             continue;
         }
diff --git a/demos/guide/quic-client-non-block.c b/demos/guide/quic-client-non-block.c
index be4c9b19676..e1735c0c5d2 100644
--- a/demos/guide/quic-client-non-block.c
+++ b/demos/guide/quic-client-non-block.c
@@ -67,6 +67,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
 
         /* Set to nonblocking mode */
         if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
             sock = -1;
             continue;
         }
diff --git a/demos/guide/quic-multi-stream.c b/demos/guide/quic-multi-stream.c
index 5b7c8581eb7..8b6567aa837 100644
--- a/demos/guide/quic-multi-stream.c
+++ b/demos/guide/quic-multi-stream.c
@@ -66,6 +66,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
 
         /* Set to nonblocking mode */
         if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
             sock = -1;
             continue;
         }
diff --git a/doc/man7/ossl-guide-quic-client-block.pod b/doc/man7/ossl-guide-quic-client-block.pod
index 595135c6966..4cf8bdd3b82 100644
--- a/doc/man7/ossl-guide-quic-client-block.pod
+++ b/doc/man7/ossl-guide-quic-client-block.pod
@@ -123,6 +123,7 @@ for TCP).
 
         /* Set to nonblocking mode */
         if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
             sock = -1;
             continue;
         }