about summary refs log tree commit diff
path: root/src/network/lookup_name.c
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2014-06-05 22:52:40 +0200
committerSzabolcs Nagy <nsz@port70.net>2014-06-05 23:06:37 +0200
commit2abb70c302efe46dfd8fd9e1d64fa00f1376f428 (patch)
tree869f116a88556e51d9a4bc365bf47ad2532d3f8b /src/network/lookup_name.c
parentb3d9e0b94ea73c68ef4169ec82c898ce59a4e30a (diff)
downloadmusl-2abb70c302efe46dfd8fd9e1d64fa00f1376f428.tar.gz
musl-2abb70c302efe46dfd8fd9e1d64fa00f1376f428.tar.xz
musl-2abb70c302efe46dfd8fd9e1d64fa00f1376f428.zip
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.
Diffstat (limited to 'src/network/lookup_name.c')
-rw-r--r--src/network/lookup_name.c4
1 files changed, 2 insertions, 2 deletions
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);
 	}