Close socket in case of errors in setting non-blocking

danielgustafsson · danielgustafsson · commit 7cfa154d15c4 · 2024-01-17T11:24:11.000+01:00
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
@@ -303,6 +303,7 @@ pgwin32_socket(int af, int type, int protocol)
 	if (ioctlsocket(s, FIONBIO, &on))
 	{
 		TranslateSocketError();
+		closesocket(s);
 		return INVALID_SOCKET;
 	}
 	errno = 0;

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ pgwin32_socket(int af, int type, int protocol)`
`303`	`303`	`if (ioctlsocket(s, FIONBIO, &on))`
`304`	`304`	`{`
`305`	`305`	`TranslateSocketError();`
	`306`	`+ closesocket(s);`
`306`	`307`	`return INVALID_SOCKET;`
`307`	`308`	`}`
`308`	`309`	`errno = 0;`