1 files changed, 7 insertions, 10 deletions

diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index d16900b4a0..3f4d916486 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getaddrinfo.c,v 1.33 2002/02/17 19:42:23 millert Exp $        */
+/*      $OpenBSD: getaddrinfo.c,v 1.34 2002/06/26 06:01:16 itojun Exp $ */
 /*      $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $    */
 
 /*
@@ -1031,8 +1031,8 @@ getanswer(answer, anslen, qname, qtype, pai)
         const u_char *cp;
         int n;
         const u_char *eom;
-        char *bp;
-        int type, class, buflen, ancount, qdcount;
+        char *bp, *ep;
+        int type, class, ancount, qdcount;
         int haveanswer, had_error;
         char tbuf[MAXDNAME];
         int (*name_ok)(const char *);
@@ -1059,13 +1059,13 @@ getanswer(answer, anslen, qname, qtype, pai)
         ancount = ntohs(hp->ancount);
         qdcount = ntohs(hp->qdcount);
         bp = hostbuf;
-        buflen = sizeof hostbuf;
+        ep = hostbuf + sizeof hostbuf;
         cp = answer->buf + HFIXEDSZ;
         if (qdcount != 1) {
                 h_errno = NO_RECOVERY;
                 return (NULL);
         }
-        n = dn_expand(answer->buf, eom, cp, bp, buflen);
+        n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
         if ((n < 0) || !(*name_ok)(bp)) {
                 h_errno = NO_RECOVERY;
                 return (NULL);
@@ -1083,14 +1083,13 @@ getanswer(answer, anslen, qname, qtype, pai)
                 }
                 canonname = bp;
                 bp += n;
-                buflen -= n;
                 /* The qname can be abbreviated, but h_name is now absolute. */
                 qname = canonname;
         }
         haveanswer = 0;
         had_error = 0;
         while (ancount-- > 0 && cp < eom && !had_error) {
-                n = dn_expand(answer->buf, eom, cp, bp, buflen);
+                n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
                 if ((n < 0) || !(*name_ok)(bp)) {
                         had_error++;
                         continue;
@@ -1117,14 +1116,13 @@ getanswer(answer, anslen, qname, qtype, pai)
                         cp += n;
                         /* Get canonical name. */
                         n = strlen(tbuf) + 1;   /* for the \0 */
-                        if (n > buflen || n >= MAXHOSTNAMELEN) {
+                        if (n > ep - bp || n >= MAXHOSTNAMELEN) {
                                 had_error++;
                                 continue;
                         }
                         strcpy(bp, tbuf);
                         canonname = bp;
                         bp += n;
-                        buflen -= n;
                         continue;
                 }
                 if (qtype == T_ANY) {
@@ -1164,7 +1162,6 @@ getanswer(answer, anslen, qname, qtype, pai)
                                 canonname = bp;
                                 nn = strlen(bp) + 1;    /* for the \0 */
                                 bp += nn;
-                                buflen -= nn;
                         }
 
                         /* don't overwrite pai */