From: Stefan Eissing <stefan@eissing.org>
Date: Thu, 25 Sep 2025 10:00:57 +0000 (+0200)
Subject: socks: handle error in verbose trace gracefully
X-Git-Tag: rc-8_17_0-1~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5bae285f321063a3d48774915bb38187b4511ac;p=thirdparty%2Fcurl.git

socks: handle error in verbose trace gracefully

Adjust the flow to always succeed in verbose trace of connect.

Reported in Joshua's sarif data

Closes #18722
---

diff --git a/lib/socks.c b/lib/socks.c
index 6927e32c3e..da974ad6d8 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -1291,15 +1291,16 @@ static CURLcode socks_proxy_cf_connect(struct Curl_cfilter *cf,
   if(Curl_trc_is_verbose(data)) {
     struct ip_quadruple ipquad;
     bool is_ipv6;
-    result = Curl_conn_cf_get_ip_info(cf->next, data, &is_ipv6, &ipquad);
-    if(result)
-      return result;
-    infof(data, "Opened %sSOCKS connection from %s port %u to %s port %u "
-          "(via %s port %u)",
-          (sockindex == SECONDARYSOCKET) ? "2nd " : "",
-          ipquad.local_ip, ipquad.local_port,
-          sx->hostname, sx->remote_port,
-          ipquad.remote_ip, ipquad.remote_port);
+    if(!Curl_conn_cf_get_ip_info(cf->next, data, &is_ipv6, &ipquad))
+      infof(data, "Opened %sSOCKS connection from %s port %u to %s port %u "
+            "(via %s port %u)",
+            (sockindex == SECONDARYSOCKET) ? "2nd " : "",
+            ipquad.local_ip, ipquad.local_port,
+            sx->hostname, sx->remote_port,
+            ipquad.remote_ip, ipquad.remote_port);
+    else
+      infof(data, "Opened %sSOCKS connection",
+            (sockindex == SECONDARYSOCKET) ? "2nd " : "");
   }
 #endif
   socks_proxy_cf_free(cf);