From: Selva Nair <selva.nair@gmail.com>
Date: Sat, 18 Mar 2023 14:13:30 +0000 (-0400)
Subject: Improve error message on short read from socks proxy
X-Git-Tag: v2.7_alpha1~509
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=172640189277c940439d24fd31a59b8faffd0b3e;p=thirdparty%2Fopenvpn.git

Improve error message on short read from socks proxy

Change-Id: Id00006bf8ea705d02eff2cbfba7d841e1cdb6ae1
Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
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 <gert@greenie.muc.de>
---

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)
         {