dns lookups: protect against cancellation and fix incorrect error codes

[musl] / src / network / getaddrinfo.c

diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index 90e85f6..c0f135f 100644 (file)
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -13,7 +13,7 @@ static int is_valid(const char *host)
 {
        const unsigned char *s;
        if (strlen(host)-1 > 254 || mbstowcs(0, host, 0) > 255) return 0;
-       for (s=host; *s>=0x80 || *s=='.' || *s=='-' || isalnum(*s); s++);
+       for (s=(void *)host; *s>=0x80 || *s=='.' || *s=='-' || isalnum(*s); s++);
        return !*s;
 }
 
@@ -117,6 +117,7 @@ int getaddrinfo(const char *host, const char *serv, const struct addrinfo *hint,
                buf->ai.ai_addr = (void *)&buf->sa;
                buf->ai.ai_addrlen = family==AF_INET6 ? sizeof sa.sin6 : sizeof sa.sin;
                buf->ai.ai_family = family;
+               buf->ai.ai_canonname = (char *)host;
                buf->sa = sa;
                buf->sa.sin.sin_port = port;
                *res = &buf->ai;