romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-25 15:57:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

async-ares: fix query counter handling

Browse source 
When starting an c-ares query, the provided callback may be invoked
right away, leading to a decrement of `queries_ongoing`. Increment
the counter *before* call c-ares. Otherwise, the `async->done` bit
is not properly set.

Closes #21399
This commit is contained in:
Stefan Eissing 2026-04-21 15:06:46 +02:00 • committed by Daniel Stenberg
parent 4daf483b5b
commit ad1fcd6111
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/asyn-ares.c
View file

@ -667,9 +667,9 @@ CURLcode Curl_async_getaddrinfo(struct Curl_easy *data,
hints.ai_family = PF_INET6;
hints.ai_socktype = socktype;
hints.ai_flags = ARES_AI_NUMERICSERV;
async->queries_ongoing++;
ares_getaddrinfo(ares->channel, async->hostname,
service, &hints, async_ares_AAAA_cb, async);
async->queries_ongoing++;
}
#endif /* CURLRES_IPV6 */
@ -681,9 +681,9 @@ CURLcode Curl_async_getaddrinfo(struct Curl_easy *data,
hints.ai_family = PF_INET;
hints.ai_socktype = socktype;
hints.ai_flags = ARES_AI_NUMERICSERV;
async->queries_ongoing++;
ares_getaddrinfo(ares->channel, async->hostname,
service, &hints, async_ares_A_cb, async);
async->queries_ongoing++;
}
#ifdef USE_HTTPSRR

2
lib/asyn-thrdd.c
View file

@ -240,11 +240,11 @@ static CURLcode async_rr_start(struct Curl_easy *data,
memset(&thrdd->rr.hinfo, 0, sizeof(thrdd->rr.hinfo));
thrdd->rr.hinfo.rrname = rrname;
async->queries_ongoing++;
ares_query_dnsrec(thrdd->rr.channel,
rrname ? rrname : async->hostname, ARES_CLASS_IN,
ARES_REC_TYPE_HTTPS,
async_thrdd_rr_done, async, NULL);
async->queries_ongoing++;
CURL_TRC_DNS(data, "[HTTPS-RR] initiated request for %s",
rrname ? rrname : async->hostname);
return CURLE_OK;