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

diff --git a/ChangeLog b/ChangeLog
index 6c50016..cb09dd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2014-05-07  Andreas Schwab  <schwab@suse.de>
+
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Advance address pointer
+       when skipping over non-matching result from nscd.
+
 2014-05-07  Ondřej Bílka  <neleai@seznam.cz>
 
        [BZ #16876]
        * nptl/sockperf.c (client): Check socket return value.
+
        [BZ #16877]
        * nscd/selinux.c (nscd_request_avc_has_perm): Check if there is
        nscd security class.

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 3385bed..6258330 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++;