pullup:

1679.   [bug]           A bad length check was introduced by change #1661
                        in dns_ho.c.

diff --git a/lib/bind/irs/dns_ho.c b/lib/bind/irs/dns_ho.c
index cac33b9ddf7de66cc67db9492ce79ef1693d07e4..2e19f1a92751aaae3a90dd5d55216c1133565af1 100644 (file)
--- a/lib/bind/irs/dns_ho.c
+++ b/lib/bind/irs/dns_ho.c
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_ho.c,v 1.15 2004/05/17 07:52:46 marka Exp $";
+static const char rcsid[] = "$Id: dns_ho.c,v 1.16 2004/08/24 00:33:35 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -444,8 +444,8 @@ ho_byaddr(struct irs_ho *this, const void *addr, int len, int af)
                                        abort();
                                qp += i;
                        }
-                       if ((qp - q->qname) + strlen(nibsuff2) + 1 >
-                           sizeof q->qname){
+                       if (strlen(q2->qname) + strlen(nibsuff2) + 1 >
+                           sizeof q2->qname) {
                                errno = ENAMETOOLONG;
                                RES_SET_H_ERRNO(pvt->res, NETDB_INTERNAL);
                                hp = NULL;