X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fnetwork%2Fgethostbyname2_r.c;h=f012ec2f9945a42d1de1ab4a57b8aab9b48524fe;hb=f081d5336a80b68d3e1bed789cc373c5c3d6699b;hp=aa8b0a9ee5031bf67e6259ca5921ca61f957a24d;hpb=e8f39ca4898237cf71657500f0b11534c47a0521;p=musl

diff --git a/src/network/gethostbyname2_r.c b/src/network/gethostbyname2_r.c
index aa8b0a9e..f012ec2f 100644
--- a/src/network/gethostbyname2_r.c
+++ b/src/network/gethostbyname2_r.c
@@ -17,11 +17,12 @@ int gethostbyname2_r(const char *name, int af,
 	int i, cnt;
 	size_t align, need;
 
+	*res = 0;
 	cnt = __lookup_name(addrs, canon, name, af, AI_CANONNAME);
 	if (cnt<0) switch (cnt) {
 	case EAI_NONAME:
 		*err = HOST_NOT_FOUND;
-		return ENOENT;
+		return 0;
 	case EAI_AGAIN:
 		*err = TRY_AGAIN;
 		return EAGAIN;
@@ -33,8 +34,6 @@ int gethostbyname2_r(const char *name, int af,
 	case EAI_SYSTEM:
 		*err = NO_RECOVERY;
 		return errno;
-	case 0:
-		break;
 	}
 
 	h->h_addrtype = af;
@@ -57,6 +56,13 @@ int gethostbyname2_r(const char *name, int af,
 	h->h_addr_list = (void *)buf;
 	buf += (cnt+1)*sizeof(char *);
 
+	for (i=0; i<cnt; i++) {
+		h->h_addr_list[i] = (void *)buf;
+		buf += h->h_length;
+		memcpy(h->h_addr_list[i], addrs[i].addr, h->h_length);
+	}
+	h->h_addr_list[i] = 0;
+
 	h->h_name = h->h_aliases[0] = buf;
 	strcpy(h->h_name, canon);
 	buf += strlen(h->h_name)+1;
@@ -69,13 +75,6 @@ int gethostbyname2_r(const char *name, int af,
 
 	h->h_aliases[2] = 0;
 
-	for (i=0; i<cnt; i++) {
-		h->h_addr_list[i] = (void *)buf;
-		buf += h->h_length;
-		memcpy(h->h_addr_list[i], addrs[i].addr, h->h_length);
-	}
-	h->h_addr_list[i] = 0;
-
 	*res = h;
 	return 0;
 }