From 2abb70c302efe46dfd8fd9e1d64fa00f1376f428 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Thu, 5 Jun 2014 22:52:40 +0200 Subject: fix the domain name length limit checks A domain name is at most 255 bytes long (RFC 1035), but the string representation is two bytes smaller so the strlen maximum is 253. --- src/network/lookup_name.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network/lookup_name.c') diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c index f324e547..68b172b4 100644 --- a/src/network/lookup_name.c +++ b/src/network/lookup_name.c @@ -14,7 +14,7 @@ static int is_valid_hostname(const char *host) { const unsigned char *s; - if (strnlen(host, 256)-1 > 254 || mbstowcs(0, host, 0) > 255) return 0; + if (strnlen(host, 254)-1 >= 253 || mbstowcs(0, host, 0) == -1) return 0; for (s=(void *)host; *s>=0x80 || *s=='.' || *s=='-' || isalnum(*s); s++); return !*s; } @@ -153,7 +153,7 @@ int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], c *canon = 0; if (name) { size_t l; - if ((l = strnlen(name, 256))-1 > 254) + if ((l = strnlen(name, 254))-1 >= 253) return EAI_NONAME; memcpy(canon, name, l+1); } -- cgit v1.2.1