deps: update to c-ares 1.17.1

lxdicted · targos · commit 5747dff04e14 · 2021-05-01T09:44:43.000+02:00
PR-URL: #36207 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/deps/cares/include/ares_version.h b/deps/cares/include/ares_version.h
@@ -6,12 +6,12 @@
 #define ARES_COPYRIGHT "2004 - 2020 Daniel Stenberg, <daniel@haxx.se>."
 
 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 16
+#define ARES_VERSION_MINOR 17
 #define ARES_VERSION_PATCH 1
 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
 (ARES_VERSION_MINOR<<8)|\
 (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.16.1"
+#define ARES_VERSION_STR "1.17.1"
 
 #if (ARES_VERSION >= 0x010700)
 # define CARES_HAVE_ARES_LIBRARY_INIT 1
diff --git a/deps/cares/include/nameser.h b/deps/cares/include/nameser.h
@@ -88,7 +88,7 @@ typedef enum __ns_type{
 ns_t_maila = 254, /* Transfer mail agent records. */
 ns_t_any = 255, /* Wildcard match. */
 ns_t_zxfr = 256, /* BIND-specific, nonstandard. */
- ns_t_caa = 257, /* CA Authorization (RFC8659) */
+ ns_t_caa = 257, /* Certification Authority Authorization. */
 ns_t_max = 65536
 } ns_type;
 
@@ -210,4 +210,9 @@ typedef enum __ns_rcode{
 
 #endif /* HAVE_ARPA_NAMESER_COMPAT_H */
 
+/* Android's bionic arpa/nameser_compat.h, nor glibc versions prior to 2.25 have T_OPT defined */
+#ifndef T_OPT
+# define T_OPT ns_t_opt
+#endif
+
 #endif /* ARES_NAMESER_H */
diff --git a/deps/cares/src/ares__readaddrinfo.c b/deps/cares/src/ares__readaddrinfo.c
@@ -163,6 +163,10 @@ int ares__readaddrinfo(FILE *fp,
 continue;
 }
 
+ /* Zero-out 'addr' struct, as there are members that we may not set, especially
+ * for ipv6. We don't want garbage data */
+ memset(&addr, 0, sizeof(addr));
+
 /*
 * Convert address string to network address for the requested families.
 * Actual address family possible values are AF_INET and AF_INET6 only.
@@ -179,7 +183,7 @@ int ares__readaddrinfo(FILE *fp,
 }
 
 node->ai_family = addr.sa.sa_family = AF_INET;
- node->ai_addrlen = sizeof(sizeof(addr.sa4));
+ node->ai_addrlen = sizeof(addr.sa4);
 node->ai_addr = ares_malloc(sizeof(addr.sa4));
 if (!node->ai_addr)
{
@@ -200,7 +204,7 @@ int ares__readaddrinfo(FILE *fp,
 }
 
 node->ai_family = addr.sa.sa_family = AF_INET6;
- node->ai_addrlen = sizeof(sizeof(addr.sa6));
+ node->ai_addrlen = sizeof(addr.sa6);
 node->ai_addr = ares_malloc(sizeof(addr.sa6));
 if (!node->ai_addr)
{
diff --git a/deps/cares/src/ares__sortaddrinfo.c b/deps/cares/src/ares__sortaddrinfo.c
@@ -85,11 +85,12 @@ struct addrinfo_sort_elem
 #define ARES_IN6_IS_ADDR_6BONE(a) \
 (((a)->s6_addr[0] == 0x3f) && ((a)->s6_addr[1] == 0xfe))
 
+
 static int get_scope(const struct sockaddr *addr)
{
 if (addr->sa_family == AF_INET6)
{
- const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr;
+ const struct sockaddr_in6 *addr6 = CARES_INADDR_CAST(const struct sockaddr_in6 *, addr);
 if (IN6_IS_ADDR_MULTICAST(&addr6->sin6_addr))
{
 return ARES_IPV6_ADDR_MC_SCOPE(&addr6->sin6_addr);
@@ -114,7 +115,7 @@ static int get_scope(const struct sockaddr *addr)
 }
 else if (addr->sa_family == AF_INET)
{
- const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr;
+ const struct sockaddr_in *addr4 = CARES_INADDR_CAST(const struct sockaddr_in *, addr);
 unsigned long int na = ntohl(addr4->sin_addr.s_addr);
 if (ARES_IN_LOOPBACK(na) || /* 127.0.0.0/8 */
 (na & 0xffff0000) == 0xa9fe0000) /* 169.254.0.0/16 */
@@ -149,7 +150,7 @@ static int get_label(const struct sockaddr *addr)
 }
 else if (addr->sa_family == AF_INET6)
{
- const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr;
+ const struct sockaddr_in6 *addr6 = CARES_INADDR_CAST(const struct sockaddr_in6 *, addr);
 if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr))
{
 return 0;
@@ -210,7 +211,7 @@ static int get_precedence(const struct sockaddr *addr)
 }
 else if (addr->sa_family == AF_INET6)
{
- const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr;
+ const struct sockaddr_in6 *addr6 = CARES_INADDR_CAST(const struct sockaddr_in6 *, addr);
 if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr))
{
 return 50;
@@ -353,10 +354,10 @@ static int rfc6724_compare(const void *ptr1, const void *ptr2)
{
 const struct sockaddr_in6 *a1_src = &a1->src_addr.sa6;
 const struct sockaddr_in6 *a1_dst =
- (const struct sockaddr_in6 *)a1->ai->ai_addr;
+ CARES_INADDR_CAST(const struct sockaddr_in6 *, a1->ai->ai_addr);
 const struct sockaddr_in6 *a2_src = &a2->src_addr.sa6;
 const struct sockaddr_in6 *a2_dst =
- (const struct sockaddr_in6 *)a2->ai->ai_addr;
+ CARES_INADDR_CAST(const struct sockaddr_in6 *, a2->ai->ai_addr);
 prefixlen1 = common_prefix_len(&a1_src->sin6_addr, &a1_dst->sin6_addr);
 prefixlen2 = common_prefix_len(&a2_src->sin6_addr, &a2_dst->sin6_addr);
 if (prefixlen1 != prefixlen2)
@@ -384,7 +385,7 @@ static int find_src_addr(ares_channel channel,
 const struct sockaddr *addr,
 struct sockaddr *src_addr)
{
- int sock;
+ ares_socket_t sock;
 int ret;
 ares_socklen_t len;
 
@@ -402,7 +403,7 @@ static int find_src_addr(ares_channel channel,
 }
 
 sock = ares__open_socket(channel, addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
- if (sock == -1)
+ if (sock == ARES_SOCKET_BAD)
{
 if (errno == EAFNOSUPPORT)
{
@@ -426,7 +427,7 @@ static int find_src_addr(ares_channel channel,
 return 0;
 }
 
- if (getsockname(sock, src_addr, &len) == -1)
+ if (getsockname(sock, src_addr, &len) != 0)
{
 ares__close_socket(channel, sock);
 return -1;
@@ -491,4 +492,4 @@ int ares__sortaddrinfo(ares_channel channel, struct ares_addrinfo_node *list_sen
 
 ares_free(elems);
 return ARES_SUCCESS;
-}
+}
diff --git a/deps/cares/src/ares_getaddrinfo.c b/deps/cares/src/ares_getaddrinfo.c
@@ -386,6 +386,9 @@ static int fake_addrinfo(const char *name,
 }
 }
 
+ node->ai_socktype = hints->ai_socktype;
+ node->ai_protocol = hints->ai_protocol;
+
 callback(arg, ARES_SUCCESS, 0, ai);
 return 1;
 }
@@ -406,6 +409,8 @@ static void end_hquery(struct host_query *hquery, int status)
 /* Set port into each address (resolved separately). */
 while (next)
{
+ next->ai_socktype = hquery->hints.ai_socktype;
+ next->ai_protocol = hquery->hints.ai_protocol;
 if (next->ai_family == AF_INET)
{
 (CARES_INADDR_CAST(struct sockaddr_in *, next->ai_addr))->sin_port = htons(hquery->port);
@@ -754,12 +759,18 @@ static int as_is_first(const struct host_query* hquery)
{
 char* p;
 int ndots = 0;
+ size_t nname = strlen(hquery->name);
 for (p = hquery->name; *p; p++)
{
 if (*p == '.')
{
 ndots++;
 }
 }
+ if (nname && hquery->name[nname-1] == '.')
+{
+ /* prevent ARES_EBADNAME for valid FQDN, where ndots < channel->ndots */
+ return 1;
+ }
 return ndots >= hquery->channel->ndots;
 }
diff --git a/deps/cares/src/ares_gethostbyaddr.c b/deps/cares/src/ares_gethostbyaddr.c
@@ -208,7 +208,6 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
 strcat(PATH_HOSTS, WIN_PATH_HOSTS);
 
 #elif defined(WATT32)
- extern const char *_w32_GetHostsFile (void);
 const char *PATH_HOSTS = _w32_GetHostsFile();
 
 if (!PATH_HOSTS)
diff --git a/deps/cares/src/ares_gethostbyname.c b/deps/cares/src/ares_gethostbyname.c
@@ -258,7 +258,7 @@ static int fake_hostent(const char *name, int family,
 struct in_addr in;
 struct ares_in6_addr in6;
 
- if (family == AF_INET || family == AF_INET6)
+ if (family == AF_INET || family == AF_UNSPEC)
{
 /* It only looks like an IP address if it's all numbers and dots. */
 int numdots = 0, valid = 1;
@@ -276,13 +276,17 @@ static int fake_hostent(const char *name, int family,
 /* if we don't have 3 dots, it is illegal
 * (although inet_pton doesn't think so).
 */
- if (numdots != 3 || !valid)
+ if (numdots != 3 || !valid){
 result = 0;
- else
+ } else{
 result = (ares_inet_pton(AF_INET, name, &in) < 1 ? 0 : 1);
+ }
 
- if (result)
- family = AF_INET;
+ /*
+ * Set address family in case of failure,
+ * as we will try to convert it later afterwards
+ */
+ family = result ? AF_INET : AF_INET6;
 }
 if (family == AF_INET6)
 result = (ares_inet_pton(AF_INET6, name, &in6) < 1 ? 0 : 1);
@@ -383,7 +387,6 @@ static int file_lookup(const char *name, int family, struct hostent **host)
 strcat(PATH_HOSTS, WIN_PATH_HOSTS);
 
 #elif defined(WATT32)
- extern const char *_w32_GetHostsFile (void);
 const char *PATH_HOSTS = _w32_GetHostsFile();
 
 if (!PATH_HOSTS)
diff --git a/deps/cares/src/ares_init.c b/deps/cares/src/ares_init.c
@@ -115,20 +115,6 @@ int ares_init_options(ares_channel *channelptr, struct ares_options *options,
 int status = ARES_SUCCESS;
 struct timeval now;
 
-#ifdef CURLDEBUG
- const char *env = getenv("CARES_MEMDEBUG");
-
- if (env)
- curl_memdebug(env);
- env = getenv("CARES_MEMLIMIT");
- if (env){
- char *endptr;
- long num = strtol(env, &endptr, 10);
- if((endptr != env) && (endptr == env + strlen(env)) && (num > 0))
- curl_memlimit(num);
- }
-#endif
-
 if (ares_library_initialized() != ARES_SUCCESS)
 return ARES_ENOTINITIALIZED; /* LCOV_EXCL_LINE: n/a on non-WinSock */
 
@@ -1611,7 +1597,8 @@ static int init_by_resolv_conf(ares_channel channel)
 if (channel->nservers == -1){
 union res_sockaddr_union addr[MAXNS];
 int nscount = res_getservers(&res, addr, MAXNS);
- for (int i = 0; i < nscount; ++i){
+ int i;
+ for (i = 0; i < nscount; ++i){
 char str[INET6_ADDRSTRLEN];
 int config_status;
 sa_family_t family = addr[i].sin.sin_family;
@@ -1639,8 +1626,9 @@ static int init_by_resolv_conf(ares_channel channel)
 if (!channel->domains){
 status = ARES_ENOMEM;
 } else{
+ int i;
 channel->ndomains = entries;
- for (int i = 0; i < channel->ndomains; ++i){
+ for (i = 0; i < channel->ndomains; ++i){
 channel->domains[i] = ares_strdup(res.dnsrch[i]);
 if (!channel->domains[i])
 status = ARES_ENOMEM;
diff --git a/deps/cares/src/ares_parse_caa_reply.c b/deps/cares/src/ares_parse_caa_reply.c
@@ -140,7 +140,7 @@ ares_parse_caa_reply (const unsigned char *abuf, int alen,
 status = ARES_EBADRESP;
 break;
 }
- caa_curr->critical = (int)*strptr++; 
+ caa_curr->critical = (int)*strptr++;
 caa_curr->plength = (int)*strptr++;
 if (caa_curr->plength <= 0 || (int)caa_curr->plength >= rr_len - 2)
{
diff --git a/deps/cares/src/ares_parse_soa_reply.c b/deps/cares/src/ares_parse_soa_reply.c
@@ -62,13 +62,16 @@ ares_parse_soa_reply(const unsigned char *abuf, int alen,
 return ARES_EBADRESP;
 if (ancount == 0)
 return ARES_EBADRESP;
-
+ 
 aptr = abuf + HFIXEDSZ;
 
 /* query name */
 status = ares__expand_name_for_response(aptr, abuf, alen, &qname, &len);
 if (status != ARES_SUCCESS)
 goto failed_stat;
+
+ if (alen <= len + HFIXEDSZ + 1)
+ goto failed;
 aptr += len;
 
 qclass = DNS_QUESTION_TYPE(aptr);
@@ -161,9 +164,9 @@ ares_parse_soa_reply(const unsigned char *abuf, int alen,
 return ARES_SUCCESS;
 }
 aptr += rr_len;
-
+ 
 ares_free(rr_name);
-
+ 
 if (aptr > abuf + alen)
 goto failed_stat;
 }
diff --git a/deps/cares/src/ares_private.h b/deps/cares/src/ares_private.h
@@ -74,6 +74,7 @@
 #elif defined(WATT32)
 
 #define PATH_RESOLV_CONF "/dev/ENV/etc/resolv.conf"
+W32_FUNC const char *_w32_GetHostsFile (void);
 
 #elif defined(NETWARE)
 
@@ -415,13 +416,4 @@ int ares__connect_socket(ares_channel channel,
 (c)->sock_state_cb((c)->sock_state_cb_data, (s), (r), (w)); \
 } WHILE_FALSE
 
-#ifdef CURLDEBUG
-/* This is low-level hard-hacking memory leak tracking and similar. Using the
- libcurl lowlevel code from within library is ugly and only works when
- c-ares is built and linked with a similarly curldebug-enabled libcurl,
- but we do this anyway for convenience. */
-#define HEADER_CURL_SETUP_ONCE_H
-#include "../lib/memdebug.h"
-#endif
-
 #endif /* __ARES_PRIVATE_H */
diff --git a/deps/cares/src/ares_process.c b/deps/cares/src/ares_process.c
diff --git a/deps/cares/src/ares_query.c b/deps/cares/src/ares_query.c
diff --git a/deps/cares/src/ares_strsplit.h b/deps/cares/src/ares_strsplit.h

-Original file line number
+Diff line change
 #defineARES_COPYRIGHT "2004 - 2020 Daniel Stenberg, <[email protected]>."
 #defineARES_VERSION_MAJOR 1
 -#defineARES_VERSION_MINOR16
 +#defineARES_VERSION_MINOR17
 #defineARES_VERSION_PATCH 1
 #defineARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
  (ARES_VERSION_MINOR<<8)|\
  (ARES_VERSION_PATCH))
 -#defineARES_VERSION_STR "1.16.1"
 +#defineARES_VERSION_STR "1.17.1"
 #if (ARES_VERSION >= 0x010700)
 # defineCARES_HAVE_ARES_LIBRARY_INIT 1
-Original file line number
+Diff line change
 ns_t_maila=254, /* Transfer mail agent records. */
 ns_t_any=255, /* Wildcard match. */
 ns_t_zxfr=256, /* BIND-specific, nonstandard. */
 -ns_t_caa=257, /* CA Authorization (RFC8659) */
 +ns_t_caa=257, /* Certification Authority Authorization. */
 ns_t_max=65536
 } ns_type;
 #endif/* HAVE_ARPA_NAMESER_COMPAT_H */
 +/* Android's bionic arpa/nameser_compat.h, nor glibc versions prior to 2.25 have T_OPT defined */
 +#ifndefT_OPT
 +# defineT_OPT ns_t_opt
 +#endif
++
 #endif/* ARES_NAMESER_H */
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,10 @@ int ares__readaddrinfo(FILE *fp,`
`163`	`163`	`continue;`
`164`	`164`	`}`
`165`	`165`
	`166`	`+/* Zero-out 'addr' struct, as there are members that we may not set, especially`
	`167`	`+ * for ipv6. We don't want garbage data */`
	`168`	`+memset(&addr, 0, sizeof(addr));`
	`169`	`+`
`166`	`170`	`/*`
`167`	`171`	`* Convert address string to network address for the requested families.`
`168`	`172`	`* Actual address family possible values are AF_INET and AF_INET6 only.`
`@@ -179,7 +183,7 @@ int ares__readaddrinfo(FILE *fp,`
`179`	`183`	`}`
`180`	`184`
`181`	`185`	`node->ai_family=addr.sa.sa_family=AF_INET;`
`182`		`-node->ai_addrlen=sizeof(sizeof(addr.sa4));`
	`186`	`+node->ai_addrlen=sizeof(addr.sa4);`
`183`	`187`	`node->ai_addr=ares_malloc(sizeof(addr.sa4));`
`184`	`188`	`if (!node->ai_addr)`
`185`	`189`	`{`
`@@ -200,7 +204,7 @@ int ares__readaddrinfo(FILE *fp,`
`200`	`204`	`}`
`201`	`205`
`202`	`206`	`node->ai_family=addr.sa.sa_family=AF_INET6;`
`203`		`-node->ai_addrlen=sizeof(sizeof(addr.sa6));`
	`207`	`+node->ai_addrlen=sizeof(addr.sa6);`
`204`	`208`	`node->ai_addr=ares_malloc(sizeof(addr.sa6));`
`205`	`209`	`if (!node->ai_addr)`
`206`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,12 @@ struct addrinfo_sort_elem`
`85`	`85`	`#defineARES_IN6_IS_ADDR_6BONE(a) \`
`86`	`86`	`(((a)->s6_addr[0] == 0x3f) && ((a)->s6_addr[1] == 0xfe))`
`87`	`87`
	`88`	`+`
`88`	`89`	`staticintget_scope(conststructsockaddr*addr)`
`89`	`90`	`{`
`90`	`91`	`if (addr->sa_family==AF_INET6)`
`91`	`92`	`{`
`92`		`-conststructsockaddr_in6addr6= (conststructsockaddr_in6)addr;`
	`93`	`+conststructsockaddr_in6addr6=CARES_INADDR_CAST(conststructsockaddr_in6, addr);`
`93`	`94`	`if (IN6_IS_ADDR_MULTICAST(&addr6->sin6_addr))`
`94`	`95`	`{`
`95`	`96`	`returnARES_IPV6_ADDR_MC_SCOPE(&addr6->sin6_addr);`
`@@ -114,7 +115,7 @@ static int get_scope(const struct sockaddr *addr)`
`114`	`115`	`}`
`115`	`116`	`elseif (addr->sa_family==AF_INET)`
`116`	`117`	`{`
`117`		`-conststructsockaddr_inaddr4= (conststructsockaddr_in)addr;`
	`118`	`+conststructsockaddr_inaddr4=CARES_INADDR_CAST(conststructsockaddr_in, addr);`
`118`	`119`	`unsigned long intna=ntohl(addr4->sin_addr.s_addr);`
`119`	`120`	`if (ARES_IN_LOOPBACK(na) \|\|/* 127.0.0.0/8 */`
`120`	`121`	`(na&0xffff0000) ==0xa9fe0000) /* 169.254.0.0/16 */`
`@@ -149,7 +150,7 @@ static int get_label(const struct sockaddr *addr)`
`149`	`150`	`}`
`150`	`151`	`elseif (addr->sa_family==AF_INET6)`
`151`	`152`	`{`
`152`		`-conststructsockaddr_in6addr6= (conststructsockaddr_in6)addr;`
	`153`	`+conststructsockaddr_in6addr6=CARES_INADDR_CAST(conststructsockaddr_in6, addr);`
`153`	`154`	`if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr))`
`154`	`155`	`{`
`155`	`156`	`return0;`
`@@ -210,7 +211,7 @@ static int get_precedence(const struct sockaddr *addr)`
`210`	`211`	`}`
`211`	`212`	`elseif (addr->sa_family==AF_INET6)`
`212`	`213`	`{`
`213`		`-conststructsockaddr_in6addr6= (conststructsockaddr_in6)addr;`
	`214`	`+conststructsockaddr_in6addr6=CARES_INADDR_CAST(conststructsockaddr_in6, addr);`
`214`	`215`	`if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr))`
`215`	`216`	`{`
`216`	`217`	`return50;`
`@@ -353,10 +354,10 @@ static int rfc6724_compare(const void ptr1, const void ptr2)`
`353`	`354`	`{`
`354`	`355`	`conststructsockaddr_in6*a1_src=&a1->src_addr.sa6;`
`355`	`356`	`conststructsockaddr_in6*a1_dst=`
`356`		`- (conststructsockaddr_in6*)a1->ai->ai_addr;`
	`357`	`+CARES_INADDR_CAST(conststructsockaddr_in6*, a1->ai->ai_addr);`
`357`	`358`	`conststructsockaddr_in6*a2_src=&a2->src_addr.sa6;`
`358`	`359`	`conststructsockaddr_in6*a2_dst=`
`359`		`- (conststructsockaddr_in6*)a2->ai->ai_addr;`
	`360`	`+CARES_INADDR_CAST(conststructsockaddr_in6*, a2->ai->ai_addr);`
`360`	`361`	`prefixlen1=common_prefix_len(&a1_src->sin6_addr, &a1_dst->sin6_addr);`
`361`	`362`	`prefixlen2=common_prefix_len(&a2_src->sin6_addr, &a2_dst->sin6_addr);`
`362`	`363`	`if (prefixlen1!=prefixlen2)`
`@@ -384,7 +385,7 @@ static int find_src_addr(ares_channel channel,`
`384`	`385`	`conststructsockaddr*addr,`
`385`	`386`	`structsockaddr*src_addr)`
`386`	`387`	`{`
`387`		`-intsock;`
	`388`	`+ares_socket_tsock;`
`388`	`389`	`intret;`
`389`	`390`	`ares_socklen_tlen;`
`390`	`391`
`@@ -402,7 +403,7 @@ static int find_src_addr(ares_channel channel,`
`402`	`403`	`}`
`403`	`404`
`404`	`405`	`sock=ares__open_socket(channel, addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);`
`405`		`-if (sock==-1)`
	`406`	`+if (sock==ARES_SOCKET_BAD)`
`406`	`407`	`{`
`407`	`408`	`if (errno==EAFNOSUPPORT)`
`408`	`409`	`{`
`@@ -426,7 +427,7 @@ static int find_src_addr(ares_channel channel,`
`426`	`427`	`return0;`
`427`	`428`	`}`
`428`	`429`
`429`		`-if (getsockname(sock, src_addr, &len) ==-1)`
	`430`	`+if (getsockname(sock, src_addr, &len) !=0)`
`430`	`431`	`{`
`431`	`432`	`ares__close_socket(channel, sock);`
`432`	`433`	`return-1;`
`@@ -491,4 +492,4 @@ int ares__sortaddrinfo(ares_channel channel, struct ares_addrinfo_node *list_sen`
`491`	`492`
`492`	`493`	`ares_free(elems);`
`493`	`494`	`returnARES_SUCCESS;`
`494`		`-}`
	`495`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,9 @@ static int fake_addrinfo(const char *name,`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
	`389`	`+node->ai_socktype=hints->ai_socktype;`
	`390`	`+node->ai_protocol=hints->ai_protocol;`
	`391`	`+`
`389`	`392`	`callback(arg, ARES_SUCCESS, 0, ai);`
`390`	`393`	`return1;`
`391`	`394`	`}`
`@@ -406,6 +409,8 @@ static void end_hquery(struct host_query *hquery, int status)`
`406`	`409`	`/* Set port into each address (resolved separately). */`
`407`	`410`	`while (next)`
`408`	`411`	`{`
	`412`	`+next->ai_socktype=hquery->hints.ai_socktype;`
	`413`	`+next->ai_protocol=hquery->hints.ai_protocol;`
`409`	`414`	`if (next->ai_family==AF_INET)`
`410`	`415`	`{`
`411`	`416`	`(CARES_INADDR_CAST(structsockaddr_in*, next->ai_addr))->sin_port=htons(hquery->port);`
`@@ -754,12 +759,18 @@ static int as_is_first(const struct host_query* hquery)`
`754`	`759`	`{`
`755`	`760`	`char*p;`
`756`	`761`	`intndots=0;`
	`762`	`+size_tnname=strlen(hquery->name);`
`757`	`763`	`for (p=hquery->name; *p; p++)`
`758`	`764`	`{`
`759`	`765`	`if (*p=='.')`
`760`	`766`	`{`
`761`	`767`	`ndots++;`
`762`	`768`	`}`
`763`	`769`	`}`
	`770`	`+if (nname&&hquery->name[nname-1] =='.')`
	`771`	`+{`
	`772`	`+/* prevent ARES_EBADNAME for valid FQDN, where ndots < channel->ndots */`
	`773`	`+return1;`
	`774`	`+ }`
`764`	`775`	`returnndots >= hquery->channel->ndots;`
`765`	`776`	`}`
-Original file line number
+Diff line change
 structin_addrin;
 structares_in6_addrin6;
 -if (family==AF_INET||family==AF_INET6)
 +if (family==AF_INET||family==AF_UNSPEC)
+{
 /* It only looks like an IP address if it's all numbers and dots. */
 intnumdots=0, valid=1;
 /* if we don't have 3 dots, it is illegal
  * (although inet_pton doesn't think so).
  */
 -if (numdots!=3|| !valid)
 +if (numdots!=3|| !valid){
 result=0;
 -else
 +} else{
 result= (ares_inet_pton(AF_INET, name, &in) <1 ? 0 : 1);
 + }
 -if (result)
 -family=AF_INET;
 +/*
 + * Set address family in case of failure,
 + * as we will try to convert it later afterwards
 + */
 +family=result ? AF_INET : AF_INET6;
+ }
 if (family==AF_INET6)
 result= (ares_inet_pton(AF_INET6, name, &in6) <1 ? 0 : 1);
 strcat(PATH_HOSTS, WIN_PATH_HOSTS);
 #elif defined(WATT32)
 -externconstchar*_w32_GetHostsFile (void);
 constchar*PATH_HOSTS=_w32_GetHostsFile();
 if (!PATH_HOSTS)
-Original file line number
+Diff line change
 intstatus=ARES_SUCCESS;
 structtimevalnow;
 -#ifdefCURLDEBUG
 -constchar*env=getenv("CARES_MEMDEBUG");
+-
 -if (env)
 -curl_memdebug(env);
 -env=getenv("CARES_MEMLIMIT");
 -if (env){
 -char*endptr;
 -longnum=strtol(env, &endptr, 10);
 -if((endptr!=env) && (endptr==env+strlen(env)) && (num>0))
 -curl_memlimit(num);
 - }
 -#endif
+-
 if (ares_library_initialized() !=ARES_SUCCESS)
 returnARES_ENOTINITIALIZED; /* LCOV_EXCL_LINE: n/a on non-WinSock */
 if (channel->nservers==-1){
 unionres_sockaddr_unionaddr[MAXNS];
 intnscount=res_getservers(&res, addr, MAXNS);
 -for (inti=0; i<nscount; ++i){
 +inti;
 +for (i=0; i<nscount; ++i){
 charstr[INET6_ADDRSTRLEN];
 intconfig_status;
 sa_family_tfamily=addr[i].sin.sin_family;
 if (!channel->domains){
 status=ARES_ENOMEM;
  } else{
 +inti;
 channel->ndomains=entries;
 -for (inti=0; i<channel->ndomains; ++i){
 +for (i=0; i<channel->ndomains; ++i){
 channel->domains[i] =ares_strdup(res.dnsrch[i]);
 if (!channel->domains[i])
 status=ARES_ENOMEM;
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ ares_parse_caa_reply (const unsigned char *abuf, int alen,`
`140`	`140`	`status=ARES_EBADRESP;`
`141`	`141`	`break;`
`142`	`142`	`}`
`143`		`-caa_curr->critical= (int)*strptr++;`
	`143`	`+caa_curr->critical= (int)*strptr++;`
`144`	`144`	`caa_curr->plength= (int)*strptr++;`
`145`	`145`	`if (caa_curr->plength <= 0\|\| (int)caa_curr->plength >= rr_len-2)`
`146`	`146`	`{`
-Original file line number
+Diff line change
 returnARES_EBADRESP;
 if (ancount==0)
 returnARES_EBADRESP;
+-
++
 aptr=abuf+HFIXEDSZ;
 /* query name */
 status=ares__expand_name_for_response(aptr, abuf, alen, &qname, &len);
 if (status!=ARES_SUCCESS)
  goto failed_stat;
++
 +if (alen <= len+HFIXEDSZ+1)
 + goto failed;
 aptr+=len;
 qclass=DNS_QUESTION_TYPE(aptr);
 returnARES_SUCCESS;
+ }
 aptr+=rr_len;
+-
++
 ares_free(rr_name);
+-
++
 if (aptr>abuf+alen)
  goto failed_stat;
+ }