romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-18 15:06:22 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: add asserts that hostname has content

Browse source 
For all network related protocols there must be a non-blank hostname
used. This change adds a few asserts in some places to make debug/tests
catch mistakes if any such would slip in.

Closes #19146
This commit is contained in:
Daniel Stenberg 2025-10-19 16:40:11 +02:00
parent 55e0526566
commit 7f19fa9819
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/doh.c
View file

@ -458,6 +458,7 @@ struct Curl_addrinfo *Curl_doh(struct Curl_easy *data,
DEBUGASSERT(conn);
DEBUGASSERT(!data->state.async.doh);
DEBUGASSERT(hostname && hostname[0]);
if(data->state.async.doh)
Curl_doh_cleanup(data);

4
lib/hostip.c
View file

@ -858,6 +858,7 @@ CURLcode Curl_resolv(struct Curl_easy *data,
/* We should intentionally error and not resolve .onion TLDs */
hostname_len = strlen(hostname);
DEBUGASSERT(hostname_len);
if(hostname_len >= 7 &&
(curl_strequal(&hostname[hostname_len - 6], ".onion") ||
curl_strequal(&hostname[hostname_len - 7], ".onion."))) {
@ -982,7 +983,7 @@ CURLcode Curl_resolv_blocking(struct Curl_easy *data,
struct Curl_dns_entry **dnsentry)
{
CURLcode result;
DEBUGASSERT(hostname && *hostname);
*dnsentry = NULL;
result = Curl_resolv(data, hostname, port, ip_version, FALSE, dnsentry);
switch(result) {
@ -1060,6 +1061,7 @@ CURLcode Curl_resolv_timeout(struct Curl_easy *data,
#endif /* USE_ALARM_TIMEOUT */
CURLcode result;
DEBUGASSERT(hostname && *hostname);
*entry = NULL;
if(timeoutms < 0)

2
lib/socks.c
View file

@ -331,6 +331,7 @@ static CURLproxycode socks4_resolving(struct socks_state *sx,
if(sx->start_resolving) {
/* need to resolve hostname to add destination address */
sx->start_resolving = FALSE;
DEBUGASSERT(sx->hostname && *sx->hostname);
result = Curl_resolv(data, sx->hostname, sx->remote_port,
cf->conn->ip_version, TRUE, &dns);
@ -858,6 +859,7 @@ static CURLproxycode socks5_resolving(struct socks_state *sx,
if(sx->start_resolving) {
/* need to resolve hostname to add destination address */
sx->start_resolving = FALSE;
DEBUGASSERT(sx->hostname && *sx->hostname);
result = Curl_resolv(data, sx->hostname, sx->remote_port,
cf->conn->ip_version, TRUE, &dns);