1618. [bug] Fencepost errors in dns_name_ishostname() and

                        dns_name_ismailbox() could trigger a INSIST().

diff --git a/CHANGES b/CHANGES
index 65b85327ffe746ff1baf5d42fa77ec13b5d40da2..c3af43005e78ca21d780aed8fb8e3aa3a1b6c731 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1618.  [bug]           Fencepost errors in dns_name_ishostname() and
+                       dns_name_ismailbox() could trigger a INSIST().
+
 1617.  [port]          win32: VC++ 6.0 support.
 
 1616.  [placeholder]   rt11127

diff --git a/lib/dns/name.c b/lib/dns/name.c
index 1f2cb8180480784d980e6e22cd7b6f658981ce3c..9e76f6c3b05ab6163a59c7df5fc322887d972659 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.144 2004/03/05 05:09:21 marka Exp $ */
+/* $Id: name.c,v 1.145 2004/04/19 21:47:43 marka Exp $ */
 
 #include <config.h>
 
@@ -285,7 +285,7 @@ dns_name_ismailbox(const dns_name_t *name) {
 
        ndata = name->ndata;
        n = *ndata++;
-       INSIST(n < 63);
+       INSIST(n <= 63);
        while (n--) {
                ch = *ndata++;
                if (!domainchar(ch))
@@ -300,7 +300,7 @@ dns_name_ismailbox(const dns_name_t *name) {
         */
        while (ndata < (name->ndata + name->length)) {
                n = *ndata++;
-               INSIST(n < 63);
+               INSIST(n <= 63);
                first = ISC_TRUE;
                while (n--) {
                        ch = *ndata++;
@@ -345,7 +345,7 @@ dns_name_ishostname(const dns_name_t *name, isc_boolean_t wildcard) {
         */
        while (ndata < (name->ndata + name->length)) {
                n = *ndata++;
-               INSIST(n < 63);
+               INSIST(n <= 63);
                first = ISC_TRUE;
                while (n--) {
                        ch = *ndata++;