summaryrefslogtreecommitdiff
path: root/lib/hostip.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-06-02 10:45:35 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-06-02 12:43:50 +0200
commitcba70628aefbfee68b329f199eace7ae950e2286 (patch)
treeca50b1e58b4faa8d3dee8c3852c77335244a232a /lib/hostip.c
parentc06ffdb6f1d92dc7c43952aba409353a5beef56b (diff)
downloadcurl-cba70628aefbfee68b329f199eace7ae950e2286.tar.gz
hostip: fix the memory-leak introduced in 67d2802
Fixes #5503 Closes #5504
Diffstat (limited to 'lib/hostip.c')
-rw-r--r--lib/hostip.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/hostip.c b/lib/hostip.c
index 49b53dc3b..dd5916e33 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -530,6 +530,7 @@ enum resolve_t Curl_resolv(struct connectdata *conn,
return CURLRESOLV_ERROR;
}
+#ifndef USE_RESOLVE_ON_IPS
/* First check if this is an IPv4 address string */
if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
/* This is a dotted IP address 123.123.123.123-style */
@@ -544,14 +545,22 @@ enum resolve_t Curl_resolv(struct connectdata *conn,
}
#endif /* ENABLE_IPV6 */
-#ifdef USE_RESOLVE_ON_IPS
- /* If given a numerical IP, USE_RESOLVE_ON_IPS means this still needs to
- get "resolved" but not with DoH */
- if(addr) {
- addr = NULL;
+#else /* if USE_RESOLVE_ON_IPS */
+ /* First check if this is an IPv4 address string */
+ if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
+ /* This is a dotted IP address 123.123.123.123-style */
ipnum = TRUE;
+#ifdef ENABLE_IPV6
+ else {
+ struct in6_addr in6;
+ /* check if this is an IPv6 address string */
+ if(Curl_inet_pton(AF_INET6, hostname, &in6) > 0)
+ /* This is an IPv6 address literal */
+ ipnum = TRUE;
}
-#endif /* USE_RESOLVE_ON_IPS */
+#endif /* ENABLE_IPV6 */
+
+#endif /* !USE_RESOLVE_ON_IPS */
if(!addr) {
/* Check what IP specifics the app has requested and if we can provide