From cccd9a58cd2ef71da3c2f9e8ed598771edbb2ed7 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 29 Sep 2007 13:52:14 +0000 Subject: Be stricter about what's a valid IP address in fake_hostent. (Patch from the Google tree.) --- ares_gethostbyname.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'ares_gethostbyname.c') diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c index 49ae53e..7a4aad6 100644 --- a/ares_gethostbyname.c +++ b/ares_gethostbyname.c @@ -209,7 +209,27 @@ static int fake_hostent(const char *name, int family, ares_host_callback callbac struct in6_addr in6; if (family == AF_INET) - result = ((in.s_addr = inet_addr(name)) == INADDR_NONE ? 0 : 1); + { + /* It only looks like an IP address if it's all numbers and dots. */ + int numdots = 0; + const char *p; + for (p = name; *p; p++) + { + if (!isdigit(*p) && *p != '.') { + return 0; + } else if (*p == '.') { + numdots++; + } + } + + /* if we don't have 3 dots, it is illegal + * (although inet_addr doesn't think so). + */ + if (numdots != 3) + result = 0; + else + result = ((in.s_addr = inet_addr(name)) == INADDR_NONE ? 0 : 1); + } else if (family == AF_INET6) result = (ares_inet_pton(AF_INET6, name, &in6) < 1 ? 0 : 1); -- cgit v1.2.3