X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fnetwork%2Fgetaddrinfo.c;h=e5fa5191c724a6d7f36eb91685eab36db5e3a30c;hb=13cd969552409e05c941829f2aabb15e2f4d9a1f;hp=8126236bb05a54efe124b335b70764aeb07061a8;hpb=9ae8d5fc71a4b61ec826d58f03f7b543755fb1d4;p=musl

diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index 8126236b..e5fa5191 100644
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -75,7 +75,8 @@ int getaddrinfo(const char *host, const char *serv, const struct addrinfo *hint,
 		type = proto==IPPROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
 
 	if (serv) {
-		port = strtoul(serv, &z, 0);
+		if (!*serv) return EAI_SERVICE;
+		port = strtoul(serv, &z, 10);
 		if (!*z && port > 65535) return EAI_SERVICE;
 		if (!port) {
 			if (flags & AI_NUMERICSERV) return EAI_SERVICE;
@@ -107,6 +108,8 @@ int getaddrinfo(const char *host, const char *serv, const struct addrinfo *hint,
 		return 0;
 	}
 
+	if (!*host) return EAI_NONAME;
+
 	/* Try as a numeric address */
 	if (__ipparse(&sa, family, host) >= 0) {
 		buf = calloc(sizeof *buf, 1+EXTRA);
@@ -117,6 +120,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;