From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 27 Jun 2016 21:11:30 +0000 (-0400)
Subject: fix misaligned address buffers in gethostbyname[2][_r] results
X-Git-Tag: v1.1.15~43
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4da0bc5ef8e0fdea65335599d947d74b7b321daa;p=oweals%2Fmusl.git

fix misaligned address buffers in gethostbyname[2][_r] results

mistakenly ordering strings before addresses in the result buffer
broke the alignment that the preceding code had set up.
---

diff --git a/src/network/gethostbyname2_r.c b/src/network/gethostbyname2_r.c
index 81f71d21..5c1cae98 100644
--- a/src/network/gethostbyname2_r.c
+++ b/src/network/gethostbyname2_r.c
@@ -58,6 +58,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;
@@ -70,13 +77,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;
 }