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

[musl] / src / network / gethostbyname2_r.c

diff --git a/src/network/gethostbyname2_r.c b/src/network/gethostbyname2_r.c
index aa8b0a9..5c1cae9 100644 (file)
--- a/src/network/gethostbyname2_r.c
+++ b/src/network/gethostbyname2_r.c
@@ -17,6 +17,7 @@ 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:
@@ -57,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;
@@ -69,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;
 }