From 172640189277c940439d24fd31a59b8faffd0b3e Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Sat, 18 Mar 2023 10:13:30 -0400 Subject: [PATCH] Improve error message on short read from socks proxy Change-Id: Id00006bf8ea705d02eff2cbfba7d841e1cdb6ae1 Signed-off-by: Selva Nair Acked-by: Gert Doering Message-Id: <20230318141330.1315235-1-selva.nair@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26437.html Signed-off-by: Gert Doering --- src/openvpn/socks.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 6a672c250..2cf0cc9f0 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -357,11 +357,16 @@ recv_socks_reply(socket_descriptor_t sd, size = recv(sd, &c, 1, MSG_NOSIGNAL); /* error? */ - if (size != 1) + if (size < 0) { msg(D_LINK_ERRORS | M_ERRNO, "recv_socks_reply: TCP port read failed on recv()"); return false; } + else if (size == 0) + { + msg(D_LINK_ERRORS, "ERROR: recv_socks_reply: empty response from socks server"); + return false; + } if (len == 3) { -- 2.47.3