Fix parsing of getai result from nscd for IPv6-only request

(cherry picked from commit 8dc9751764eb1bedf06d19695524b31a16773413)

diff --git a/ChangeLog b/ChangeLog
index 51573d0c2d33c75c28607ead30cb35eed9e4b771..6aff2a266bbb0cd44612715a8a78f1f85ed11ae5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-02  Andreas Schwab  <schwab@suse.de>
+
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Advance address pointer
+       when skipping over non-matching result from nscd.
+
 2015-09-11  Alan Modra  <amodra@gmail.com>
 
        [BZ #17153]

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index b3cc1246cb3f5e41c7f45057c15ae1dc60e4441d..d2283bcd4ad4fe7e41cf9c6ee74ec8c63ab32e34 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -710,16 +710,20 @@ gaih_inet (const char *name, const struct gaih_service *service,
                  struct gaih_addrtuple *addrfree = addrmem;
                  for (int i = 0; i < air->naddrs; ++i)
                    {
+                     socklen_t size = (air->family[i] == AF_INET
+                                       ? INADDRSZ : IN6ADDRSZ);
+
                      if (!((air->family[i] == AF_INET
                             && req->ai_family == AF_INET6
                             && (req->ai_flags & AI_V4MAPPED) != 0)
                            || req->ai_family == AF_UNSPEC
                            || air->family[i] == req->ai_family))
-                       /* Skip over non-matching result.  */
-                       continue;
+                       {
+                         /* Skip over non-matching result.  */
+                         addrs += size;
+                         continue;
+                       }
 
-                     socklen_t size = (air->family[i] == AF_INET
-                                       ? INADDRSZ : IN6ADDRSZ);
                      if (*pat == NULL)
                        {
                          *pat = addrfree++;