diff options
| author | Szabolcs Nagy <nsz@port70.net> | 2014-06-06 19:20:07 +0200 |
|---|---|---|
| committer | Szabolcs Nagy <nsz@port70.net> | 2014-06-06 20:41:15 +0200 |
| commit | 07355f503a9b0a3ab7a051e2931499a4c5898b15 (patch) | |
| tree | 2807935cfeca2b4bc8335352d7b134fa5b58f0e7 /src/network/lookup_name.c | |
| parent | 9ce2860fa34ede8f84b8ca5ac1746a58b171a023 (diff) | |
| download | musl-07355f503a9b0a3ab7a051e2931499a4c5898b15.tar.gz musl-07355f503a9b0a3ab7a051e2931499a4c5898b15.tar.xz musl-07355f503a9b0a3ab7a051e2931499a4c5898b15.zip | |
accept trailing . and empty domain names
trailing . should be accepted in domain name strings by convention (RFC 1034), host name lookup accepts "." but rejects empty "", res_* interfaces also accept empty name following existing practice.
Diffstat (limited to 'src/network/lookup_name.c')
| -rw-r--r-- | src/network/lookup_name.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c index 68b172b4..743aa082 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, 254)-1 >= 253 || mbstowcs(0, host, 0) == -1) return 0; + if (strnlen(host, 255)-1 >= 254 || mbstowcs(0, host, 0) == -1) return 0; for (s=(void *)host; *s>=0x80 || *s=='.' || *s=='-' || isalnum(*s); s++); return !*s; } @@ -152,8 +152,9 @@ int __lookup_name(struct address buf[static MAXADDRS], char canon[static 256], c *canon = 0; if (name) { - size_t l; - if ((l = strnlen(name, 254))-1 >= 253) + /* reject empty name and check len so it fits into temp bufs */ + size_t l = strnlen(name, 255); + if (l-1 >= 254) return EAI_NONAME; memcpy(canon, name, l+1); } |