From 4da0bc5ef8e0fdea65335599d947d74b7b321daa Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 27 Jun 2016 17:11:30 -0400 Subject: [PATCH] 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. --- src/network/gethostbyname2_r.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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; ih_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; ih_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; }