From: Daniel Gustafsson <dgustafsson@postgresql.org>
Date: Wed, 17 Jan 2024 10:24:11 +0000 (+0100)
Subject: Close socket in case of errors in setting non-blocking
X-Git-Tag: REL_12_18~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db0d238419decf7edfd84b24d1a151b3ac21dc6a;p=thirdparty%2Fpostgresql.git

Close socket in case of errors in setting non-blocking

If configuring the newly created socket non-blocking fails we
error out and return INVALID_SOCKET, but the socket that had
been created wasn't closed. Fix by issuing closesocket in the
errorpath.

Backpatch to all supported branches.

Author: Ranier Vilela <ranier.vf@gmail.com>
Discussion: https://postgr.es/m/CAEudQApmU5CrKefH85VbNYE2y8H=-qqEJbg6RAPU65+vCe+89A@mail.gmail.com
Backpatch-through: v12
---

diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c
index d5b5e771e91..2fcfc68a315 100644
--- a/src/backend/port/win32/socket.c
+++ b/src/backend/port/win32/socket.c
@@ -290,6 +290,7 @@ pgwin32_socket(int af, int type, int protocol)
 	if (ioctlsocket(s, FIONBIO, &on))
 	{
 		TranslateSocketError();
+		closesocket(s);
 		return INVALID_SOCKET;
 	}
 	errno = 0;