From fc4ae23cc22a12d283a291c5986270fef88b9120 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 18 Aug 2025 09:54:50 +0200 Subject: [PATCH] asyn-thrdd: fix Curl_async_pollset without socketpair - remove a superfluous if() - edit the #ifdef to only do the timeout checks when socketpair support is missing, as that code flow could not be reached otherways anyway CodeSonar pointed out possible issue that led me to see this. Closes #18306 --- lib/asyn-thrdd.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c index 509ec427a8..7884dc166a 100644 --- a/lib/asyn-thrdd.c +++ b/lib/asyn-thrdd.c @@ -655,12 +655,9 @@ CURLcode Curl_async_pollset(struct Curl_easy *data, struct easy_pollset *ps) return result; #ifndef CURL_DISABLE_SOCKETPAIR - if(thrdd->addr) { - /* return read fd to client for polling the DNS resolution status */ - result = Curl_pollset_add_in(data, ps, thrdd->addr->sock_pair[0]); - } - else -#endif + /* return read fd to client for polling the DNS resolution status */ + result = Curl_pollset_add_in(data, ps, thrdd->addr->sock_pair[0]); +#else { timediff_t milli; timediff_t ms = curlx_timediff(curlx_now(), thrdd->addr->start); @@ -674,7 +671,7 @@ CURLcode Curl_async_pollset(struct Curl_easy *data, struct easy_pollset *ps) milli = 200; Curl_expire(data, milli, EXPIRE_ASYNC_NAME); } - +#endif return result; }