From 5cf88a83f27b0cd2d5a83511930e40d716c939eb Mon Sep 17 00:00:00 2001 From: Dmitry Bilunov Date: Sat, 24 Jun 2017 16:49:34 +0200 Subject: getaddrinfo: Merge IPv6 addresses and IPv4 addresses [BZ #21295] --- ChangeLog | 6 ++++++ sysdeps/posix/getaddrinfo.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b4c8dd..eb9eb58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-06-24 Dmitry Bilunov + + [BZ #21295] + * sysdeps/posix/getaddrinfo.c (convert_hostent_to_gaih_addrtuple): + Append addresses at the end of the list. + 2017-06-23 H.J. Lu [BZ #21666] diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 4ec1796..91e0a76 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -190,16 +190,16 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, /* Convert struct hostent to a list of struct gaih_addrtuple objects. h_name is not copied, and the struct hostent object must not be - deallocated prematurely. *RESULT must be NULL or a pointer to an - object allocated using malloc, which is freed. */ + deallocated prematurely. *RESULT must be NULL or a pointer to a + linked-list. The new addresses are appended at the end. */ static bool convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family, struct hostent *h, struct gaih_addrtuple **result) { - free (*result); - *result = NULL; + while (*result) + result = &(*result)->next; /* Count the number of addresses in h->h_addr_list. */ size_t count = 0; -- cgit v1.1