Backport fix for getnetbyname Tested:

diff --git a/README.google b/README.google
index 3589cc86161eb2c97315f14d9accca82e82961fa..d9d6760aef7eec07d472e91b8792ef2e2c0d7853 100644 (file)
--- a/README.google
+++ b/README.google
@@ -420,3 +420,7 @@ dlfcn/dlopen.c
 
 resolv/res_libc.c
   For b/18473393, port r9102, r11566, and r14311 from eglibc sources.
+
+resolv/nss_dns/dns-resolve.c
+  For b/18752432, backport infinite loop fix in getnetbyname (PR17630)
+  https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=11e3417af6e354f1942c68a271ae51e892b2814d

diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 8e80a6010e1f25d86c2bdd48c3378ade70150db8..60c94f38a4da67d6261a6adadf2f9b536338a335 100644 (file)
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -398,8 +398,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
 
        case BYNAME:
          {
-           char **ap = result->n_aliases++;
-           while (*ap != NULL)
+           char **ap;
+           for (ap = result->n_aliases; *ap != NULL; ++ap)
              {
                /* Check each alias name for being of the forms:
                   4.3.2.1.in-addr.arpa         = net 1.2.3.4