diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index e32891e5c7..9762dbe80b 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.113 2000/10/25 04:26:44 marka Exp $ */
+/* $Id: rdata.c,v 1.114 2000/10/25 05:43:24 marka Exp $ */
 
 #include <config.h>
 #include <ctype.h>
@@ -515,9 +515,6 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx,
 		INSIST(rdata->length == 0);
 		return (ISC_R_SUCCESS);
 	}
-#if 0
-	INSIST(rdata->type == dns_rdatatype_opt || rdata->length != 0);	/* XXXMPA remove */
-#endif
 
 	st = *target;
 
@@ -761,8 +758,10 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
 	/*
 	 * Some DynDNS meta-RRs have empty rdata.
 	 */
-	if (rdata->length == 0)
+	if ((rdata->flags & DNS_RDATA_UPDATE) != 0) {
+		INSIST(rdata->length == 0);
 		return (ISC_R_SUCCESS);
+	}
 
 	TOTEXTSWITCH
 
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 16af8792c9..a92fe4fe80 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.c,v 1.43 2000/08/01 01:25:04 tale Exp $ */
+/* $Id: tsig_250.c,v 1.44 2000/10/25 05:43:26 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
 
@@ -26,7 +26,7 @@
 	(DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_NOTQUESTION)
 
 static inline isc_result_t
-	fromtext_any_tsig(ARGS_FROMTEXT) {
+fromtext_any_tsig(ARGS_FROMTEXT) {
 	isc_token_t token;
 	dns_name_t name;
 	isc_uint64_t sigtime;
@@ -132,6 +132,7 @@ totext_any_tsig(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 250);
 	REQUIRE(rdata->rdclass == 255);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 	/*
@@ -297,6 +298,7 @@ towire_any_tsig(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 250);
 	REQUIRE(rdata->rdclass == 255);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_rdata_toregion(rdata, &sr);
@@ -319,6 +321,8 @@ compare_any_tsig(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 250);
 	REQUIRE(rdata1->rdclass == 255);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -410,6 +414,7 @@ tostruct_any_tsig(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 250);
 	REQUIRE(rdata->rdclass == 255);
+	REQUIRE(rdata->length != 0);
 
 	tsig = (dns_rdata_any_tsig_t *) target;
 	tsig->common.rdclass = rdata->rdclass;
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index e0fd240f7a..96f1e4faa2 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: afsdb_18.c,v 1.31 2000/08/01 01:25:06 tale Exp $ */
+/* $Id: afsdb_18.c,v 1.32 2000/10/25 05:43:27 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
 
@@ -64,6 +64,7 @@ totext_afsdb(ARGS_TOTEXT) {
 	unsigned int num;
 
 	REQUIRE(rdata->type == 18);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -111,6 +112,7 @@ towire_afsdb(ARGS_TOWIRE) {
 	dns_name_t name;
 
 	REQUIRE(rdata->type == 18);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	isc_buffer_availableregion(target, &tr);
@@ -138,6 +140,8 @@ compare_afsdb(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 18);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	result = memcmp(rdata1->data, rdata2->data, 2);
 	if (result != 0)
@@ -181,6 +185,7 @@ tostruct_afsdb(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 18);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	afsdb->common.rdclass = rdata->rdclass;
 	afsdb->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 15fa7081db..3623d9ddda 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.c,v 1.32 2000/08/01 01:25:08 tale Exp $ */
+/* $Id: cert_37.c,v 1.33 2000/10/25 05:43:28 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
 
@@ -70,6 +70,7 @@ totext_cert(ARGS_TOTEXT) {
 	unsigned int n;
 
 	REQUIRE(rdata->type == 37);
+	REQUIRE(rdata->length != 0);
 
 	UNUSED(tctx);
 
@@ -133,6 +134,7 @@ towire_cert(ARGS_TOWIRE) {
 	isc_region_t sr;
 
 	REQUIRE(rdata->type == 37);
+	REQUIRE(rdata->length != 0);
 
 	UNUSED(cctx);
 
@@ -148,6 +150,8 @@ compare_cert(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 37);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -177,6 +181,7 @@ tostruct_cert(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 37);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	cert->common.rdclass = rdata->rdclass;
 	cert->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index bc8b2a483b..a228044182 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cname_5.c,v 1.35 2000/08/01 01:25:10 tale Exp $ */
+/* $Id: cname_5.c,v 1.36 2000/10/25 05:43:29 marka Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -51,6 +51,7 @@ totext_cname(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 5);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -83,6 +84,7 @@ towire_cname(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 5);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -103,6 +105,8 @@ compare_cname(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 5);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -138,6 +142,7 @@ tostruct_cname(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 5);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	cname->common.rdclass = rdata->rdclass;
 	cname->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index bf64a4a29b..b68499611d 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dname_39.c,v 1.25 2000/08/01 01:25:13 tale Exp $ */
+/* $Id: dname_39.c,v 1.26 2000/10/25 05:43:30 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
 
@@ -52,6 +52,7 @@ totext_dname(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 39);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -84,6 +85,7 @@ towire_dname(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 39);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_name_init(&name, NULL);
@@ -103,6 +105,8 @@ compare_dname(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 39);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -138,6 +142,7 @@ tostruct_dname(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 39);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	dname->common.rdclass = rdata->rdclass;
 	dname->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 229f65ceab..fc8ed3a215 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gpos_27.c,v 1.24 2000/08/01 01:25:15 tale Exp $ */
+/* $Id: gpos_27.c,v 1.25 2000/10/25 05:43:31 marka Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -51,6 +51,7 @@ totext_gpos(ARGS_TOTEXT) {
 	int i;
 
 	REQUIRE(rdata->type == 27);
+	REQUIRE(rdata->length != 0);
 
 	UNUSED(tctx);
 
@@ -84,6 +85,7 @@ static inline isc_result_t
 towire_gpos(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 27);
+	REQUIRE(rdata->length != 0);
 
 	UNUSED(cctx);
 
@@ -98,6 +100,8 @@ compare_gpos(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 27);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -128,6 +132,7 @@ tostruct_gpos(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 27);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	gpos->common.rdclass = rdata->rdclass;
 	gpos->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index ab59534930..9c2bc97103 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hinfo_13.c,v 1.29 2000/08/01 01:25:17 tale Exp $ */
+/* $Id: hinfo_13.c,v 1.30 2000/10/25 05:43:33 marka Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -52,6 +52,7 @@ totext_hinfo(ARGS_TOTEXT) {
 	UNUSED(tctx);
 
 	REQUIRE(rdata->type == 13);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &region);
 	RETERR(txt_totext(&region, target));
@@ -78,6 +79,7 @@ towire_hinfo(ARGS_TOWIRE) {
 	UNUSED(cctx);
 
 	REQUIRE(rdata->type == 13);
+	REQUIRE(rdata->length != 0);
 
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
@@ -90,6 +92,8 @@ compare_hinfo(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 13);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -118,6 +122,7 @@ tostruct_hinfo(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 13);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	hinfo->common.rdclass = rdata->rdclass;
 	hinfo->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 39e7e8efbf..632f2b4dfd 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: isdn_20.c,v 1.22 2000/08/01 01:25:19 tale Exp $ */
+/* $Id: isdn_20.c,v 1.23 2000/10/25 05:43:34 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
 
@@ -57,6 +57,7 @@ totext_isdn(ARGS_TOTEXT) {
 	UNUSED(tctx);
 
 	REQUIRE(rdata->type == 20);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &region);
 	RETERR(txt_totext(&region, target));
@@ -85,6 +86,7 @@ towire_isdn(ARGS_TOWIRE) {
 	UNUSED(cctx);
 
 	REQUIRE(rdata->type == 20);
+	REQUIRE(rdata->length != 0);
 
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
@@ -97,6 +99,8 @@ compare_isdn(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 20);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -125,6 +129,7 @@ tostruct_isdn(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 20);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	isdn->common.rdclass = rdata->rdclass;
 	isdn->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 5cc3ef8072..0aee1ee80e 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.31 2000/09/08 14:23:43 bwelling Exp $ */
+/* $Id: key_25.c,v 1.32 2000/10/25 05:43:36 marka Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -73,6 +73,7 @@ totext_key(ARGS_TOTEXT) {
 	unsigned char algorithm;
 
 	REQUIRE(rdata->type == 25);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 
@@ -144,6 +145,7 @@ towire_key(ARGS_TOWIRE) {
 	UNUSED(cctx);
 
 	REQUIRE(rdata->type == 25);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 	return (mem_tobuffer(target, sr.base, sr.length));
@@ -157,6 +159,8 @@ compare_key(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 25);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -192,6 +196,7 @@ tostruct_key(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 25);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	key->common.rdclass = rdata->rdclass;
 	key->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index b87337ea09..c791ced1a0 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: loc_29.c,v 1.23 2000/08/01 01:25:24 tale Exp $ */
+/* $Id: loc_29.c,v 1.24 2000/10/25 05:43:37 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
 
@@ -433,6 +433,7 @@ totext_loc(ARGS_TOTEXT) {
 	UNUSED(tctx);
 
 	REQUIRE(rdata->type == 29);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 
@@ -585,6 +586,7 @@ towire_loc(ARGS_TOWIRE) {
 	UNUSED(cctx);
 
 	REQUIRE(rdata->type == 29);
+	REQUIRE(rdata->length != 0);
 
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
@@ -597,6 +599,8 @@ compare_loc(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 29);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -652,6 +656,7 @@ tostruct_loc(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 29);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	UNUSED(mctx);
 
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index f22eb2badc..fb20ea1290 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mb_7.c,v 1.33 2000/08/01 01:25:26 tale Exp $ */
+/* $Id: mb_7.c,v 1.34 2000/10/25 05:43:38 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
 
@@ -50,6 +50,7 @@ totext_mb(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 7);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -82,6 +83,7 @@ towire_mb(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 7);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -102,6 +104,8 @@ compare_mb(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 7);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -137,6 +141,7 @@ tostruct_mb(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 7);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	mb->common.rdclass = rdata->rdclass;
 	mb->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 3bdf294b87..7698da9f56 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md_3.c,v 1.35 2000/08/01 01:25:28 tale Exp $ */
+/* $Id: md_3.c,v 1.36 2000/10/25 05:43:39 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
 
@@ -50,6 +50,7 @@ totext_md(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 3);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -82,6 +83,7 @@ towire_md(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 3);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -102,6 +104,8 @@ compare_md(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 3);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -137,6 +141,7 @@ tostruct_md(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 3);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	md->common.rdclass = rdata->rdclass;
 	md->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index dff440e855..cd27d37df0 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mf_4.c,v 1.33 2000/08/01 01:25:30 tale Exp $ */
+/* $Id: mf_4.c,v 1.34 2000/10/25 05:43:40 marka Exp $ */
 
 /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
 
@@ -50,6 +50,7 @@ totext_mf(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 4);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -82,6 +83,7 @@ towire_mf(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 4);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -102,6 +104,8 @@ compare_mf(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 4);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -137,6 +141,7 @@ tostruct_mf(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 4);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	mf->common.rdclass = rdata->rdclass;
 	mf->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 4e59368d9e..15279341f1 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mg_8.c,v 1.31 2000/08/01 01:25:33 tale Exp $ */
+/* $Id: mg_8.c,v 1.32 2000/10/25 05:43:42 marka Exp $ */
 
 /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
 
@@ -50,6 +50,7 @@ totext_mg(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 8);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -82,6 +83,7 @@ towire_mg(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 8);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -102,6 +104,8 @@ compare_mg(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 8);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -137,6 +141,7 @@ tostruct_mg(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 8);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	mg->common.rdclass = rdata->rdclass;
 	mg->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index 096ff84087..7526b3e195 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: minfo_14.c,v 1.32 2000/08/01 01:25:35 tale Exp $ */
+/* $Id: minfo_14.c,v 1.33 2000/10/25 05:43:43 marka Exp $ */
 
 /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
 
@@ -56,6 +56,7 @@ totext_minfo(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 14);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&rmail, NULL);
 	dns_name_init(&email, NULL);
@@ -104,6 +105,7 @@ towire_minfo(ARGS_TOWIRE) {
 	dns_name_t email;
 
 	REQUIRE(rdata->type == 14);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -134,6 +136,8 @@ compare_minfo(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 14);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -186,6 +190,7 @@ tostruct_minfo(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 14);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	minfo->common.rdclass = rdata->rdclass;
 	minfo->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 7a908b4821..86e3aca953 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mr_9.c,v 1.30 2000/08/01 01:25:37 tale Exp $ */
+/* $Id: mr_9.c,v 1.31 2000/10/25 05:43:44 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
 
@@ -50,6 +50,7 @@ totext_mr(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 9);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -82,6 +83,7 @@ towire_mr(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 9);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -102,6 +104,8 @@ compare_mr(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 9);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -137,6 +141,7 @@ tostruct_mr(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 9);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	mr->common.rdclass = rdata->rdclass;
 	mr->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 95b1292a42..71c171d2ba 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mx_15.c,v 1.40 2000/08/01 01:25:39 tale Exp $ */
+/* $Id: mx_15.c,v 1.41 2000/10/25 05:43:45 marka Exp $ */
 
 /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
 
@@ -56,6 +56,7 @@ totext_mx(ARGS_TOTEXT) {
 	unsigned short num;
 
 	REQUIRE(rdata->type == 15);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -100,6 +101,7 @@ towire_mx(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 15);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -124,6 +126,8 @@ compare_mx(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 15);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	order = memcmp(rdata1->data, rdata2->data, 2);
 	if (order != 0)
@@ -167,6 +171,7 @@ tostruct_mx(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 15);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	mx->common.rdclass = rdata->rdclass;
 	mx->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 51c54268ce..7c6f172da2 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ns_2.c,v 1.34 2000/08/01 01:25:42 tale Exp $ */
+/* $Id: ns_2.c,v 1.35 2000/10/25 05:43:46 marka Exp $ */
 
 /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
 
@@ -50,6 +50,7 @@ totext_ns(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 2);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -82,6 +83,7 @@ towire_ns(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 2);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -102,6 +104,8 @@ compare_ns(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 2);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -137,6 +141,7 @@ tostruct_ns(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 2);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	ns->common.rdclass = rdata->rdclass;
 	ns->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index c8aefb3fb0..5a81d8ddea 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: null_10.c,v 1.28 2000/08/01 01:25:44 tale Exp $ */
+/* $Id: null_10.c,v 1.29 2000/10/25 05:43:47 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
 
@@ -81,6 +81,8 @@ compare_null(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata1->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 10);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index bf64384eb4..315e9b89b1 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nxt_30.c,v 1.40 2000/10/06 22:41:15 bwelling Exp $ */
+/* $Id: nxt_30.c,v 1.41 2000/10/25 05:43:48 marka Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 
@@ -93,6 +93,7 @@ totext_nxt(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 30);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -151,6 +152,7 @@ towire_nxt(ARGS_TOWIRE) {
 	dns_name_t name;
 
 	REQUIRE(rdata->type == 30);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_name_init(&name, NULL);
@@ -173,6 +175,8 @@ compare_nxt(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 30);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -213,6 +217,7 @@ tostruct_nxt(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 30);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	nxt->common.rdclass = rdata->rdclass;
 	nxt->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index 5259276277..26eaaf9506 100644
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: proforma.c,v 1.27 2000/08/01 01:25:51 tale Exp $ */
+/* $Id: proforma.c,v 1.28 2000/10/25 05:43:49 marka Exp $ */
 
 #ifndef RDATA_GENERIC_#_#_C
 #define RDATA_GENERIC_#_#_C
@@ -39,6 +39,7 @@ totext_#(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == #);
 	REQUIRE(rdata->rdclass == #);
+	REQUIRE(rdata->length != 0);	/* XXX */
 
 	return (ISC_R_NOTIMPLEMENTED);
 }
@@ -60,6 +61,7 @@ towire_#(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == #);
 	REQUIRE(rdata->rdclass == #);
+	REQUIRE(rdata->length != 0);	/* XXX */
 
 	/* NONE or GLOBAL14 */
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
@@ -76,6 +78,8 @@ compare_#(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == #);
 	REQUIRE(rdata1->rdclass == #);
+	REQUIRE(rdata1->length != 0);	/* XXX */
+	REQUIRE(rdata2->length != 0);	/* XXX */
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -100,6 +104,7 @@ tostruct_#(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == #);
 	REQUIRE(rdata->rdclass == #);
+	REQUIRE(rdata->length != 0);	/* XXX */
 
 	return (ISC_R_NOTIMPLEMENTED);
 }
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index ddd6d11525..726ddcb636 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ptr_12.c,v 1.31 2000/08/01 01:25:53 tale Exp $ */
+/* $Id: ptr_12.c,v 1.32 2000/10/25 05:43:50 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
 
@@ -50,6 +50,7 @@ totext_ptr(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 12);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -82,6 +83,7 @@ towire_ptr(ARGS_TOWIRE) {
 	isc_region_t region;
 
 	REQUIRE(rdata->type == 12);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -102,6 +104,8 @@ compare_ptr(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 12);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -137,6 +141,7 @@ tostruct_ptr(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 12);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	ptr->common.rdclass = rdata->rdclass;
 	ptr->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 55e4fbbddb..d43b0d55c8 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rp_17.c,v 1.27 2000/08/01 01:25:55 tale Exp $ */
+/* $Id: rp_17.c,v 1.28 2000/10/25 05:43:52 marka Exp $ */
 
 /* RFC 1183 */
 
@@ -57,6 +57,7 @@ totext_rp(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 17);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&rmail, NULL);
 	dns_name_init(&email, NULL);
@@ -104,6 +105,7 @@ towire_rp(ARGS_TOWIRE) {
 	dns_name_t email;
 
 	REQUIRE(rdata->type == 17);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_name_init(&rmail, NULL);
@@ -133,6 +135,8 @@ compare_rp(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 17);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -184,6 +188,7 @@ tostruct_rp(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 17);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	rp->common.rdclass = rdata->rdclass;
 	rp->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 14149ffd79..f578c65504 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rt_21.c,v 1.29 2000/08/01 01:25:58 tale Exp $ */
+/* $Id: rt_21.c,v 1.30 2000/10/25 05:43:53 marka Exp $ */
 
 /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
 
@@ -59,6 +59,7 @@ totext_rt(ARGS_TOTEXT) {
 	unsigned short num;
 
 	REQUIRE(rdata->type == 21);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -106,6 +107,7 @@ towire_rt(ARGS_TOWIRE) {
 	isc_region_t tr;
 
 	REQUIRE(rdata->type == 21);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	isc_buffer_availableregion(target, &tr);
@@ -133,6 +135,8 @@ compare_rt(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 21);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	order = memcmp(rdata1->data, rdata2->data, 2);
 	if (order != 0)
@@ -176,6 +180,7 @@ tostruct_rt(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 21);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	rt->common.rdclass = rdata->rdclass;
 	rt->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 11fd7177b5..b396083d49 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig_24.c,v 1.45 2000/08/01 01:26:00 tale Exp $ */
+/* $Id: sig_24.c,v 1.46 2000/10/25 05:43:54 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
@@ -128,6 +128,7 @@ totext_sig(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 24);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 
@@ -271,6 +272,7 @@ towire_sig(ARGS_TOWIRE) {
 	dns_name_t name;
 
 	REQUIRE(rdata->type == 24);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_rdata_toregion(rdata, &sr);
@@ -311,6 +313,8 @@ compare_sig(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 24);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -406,6 +410,7 @@ tostruct_sig(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 24);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	sig->common.rdclass = rdata->rdclass;
 	sig->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 9b55439422..054614ac50 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa_6.c,v 1.44 2000/08/24 21:41:43 gson Exp $ */
+/* $Id: soa_6.c,v 1.45 2000/10/25 05:43:55 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
 
@@ -77,6 +77,7 @@ totext_soa(ARGS_TOTEXT) {
 	isc_boolean_t comment;
 
 	REQUIRE(rdata->type == 6);
+	REQUIRE(rdata->length != 0);
 
 	multiline = ISC_TF((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0);
 	comment = ISC_TF((tctx->flags & DNS_STYLEFLAG_COMMENT) != 0);
@@ -177,6 +178,7 @@ towire_soa(ARGS_TOWIRE) {
 	dns_name_t rname;
 
 	REQUIRE(rdata->type == 6);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
 
@@ -213,6 +215,8 @@ compare_soa(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 6);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -276,6 +280,7 @@ tostruct_soa(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 6);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	soa->common.rdclass = rdata->rdclass;
 	soa->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index 53685e9a56..3653d85791 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey_249.c,v 1.38 2000/08/01 01:26:04 tale Exp $ */
+/* $Id: tkey_249.c,v 1.39 2000/10/25 05:43:56 marka Exp $ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@@ -124,6 +124,7 @@ totext_tkey(ARGS_TOTEXT) {
 	isc_boolean_t sub;
 
 	REQUIRE(rdata->type == 249);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 
@@ -286,6 +287,7 @@ towire_tkey(ARGS_TOWIRE) {
 	dns_name_t name;
 
 	REQUIRE(rdata->type == 249);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	/*
@@ -311,6 +313,8 @@ compare_tkey(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 249);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	/*
 	 * Algorithm.
@@ -395,6 +399,7 @@ tostruct_tkey(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 249);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	tkey->common.rdclass = rdata->rdclass;
 	tkey->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index f40c4106d5..91ca65ccb1 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: x25_19.c,v 1.23 2000/08/01 01:26:11 tale Exp $ */
+/* $Id: x25_19.c,v 1.24 2000/10/25 05:43:57 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
 
@@ -53,6 +53,7 @@ totext_x25(ARGS_TOTEXT) {
 	UNUSED(tctx);
 
 	REQUIRE(rdata->type == 19);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &region);
 	return (txt_totext(&region, target));
@@ -79,6 +80,7 @@ towire_x25(ARGS_TOWIRE) {
 	UNUSED(cctx);
 
 	REQUIRE(rdata->type == 19);
+	REQUIRE(rdata->length != 0);
 
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
@@ -91,6 +93,8 @@ compare_x25(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 19);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -124,6 +128,7 @@ tostruct_x25(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 19);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	x25->common.rdclass = rdata->rdclass;
 	x25->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index dcaaf39849..45b0e18cc0 100644
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.17 2000/08/28 17:39:21 bwelling Exp $ */
+/* $Id: a_1.c,v 1.18 2000/10/25 05:43:59 marka Exp $ */
 
 /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
 
@@ -100,6 +100,7 @@ towire_hs_a(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 1);
 	REQUIRE(rdata->rdclass == 4);
+	REQUIRE(rdata->length == 4);
 
 	UNUSED(cctx);
 
@@ -119,6 +120,8 @@ compare_hs_a(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 1);
 	REQUIRE(rdata1->rdclass == 4);
+	REQUIRE(rdata1->length == 4);
+	REQUIRE(rdata2->length == 4);
 
 	order = memcmp(rdata1->data, rdata2->data, 4);
 	if (order != 0)
@@ -151,6 +154,7 @@ tostruct_hs_a(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 1);
 	REQUIRE(rdata->rdclass == 4);
+	REQUIRE(rdata->length == 4);
 
 	UNUSED(mctx);
 
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index c582b8aeac..a84f612e53 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a6_38.c,v 1.36 2000/08/01 01:26:16 tale Exp $ */
+/* $Id: a6_38.c,v 1.37 2000/10/25 05:44:00 marka Exp $ */
 
 /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
@@ -94,6 +94,7 @@ totext_in_a6(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 38);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 	prefixlen = sr.base[0];
@@ -184,6 +185,7 @@ towire_in_a6(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 38);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_rdata_toregion(rdata, &sr);
@@ -216,6 +218,8 @@ compare_in_a6(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 38);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &region1);
 	dns_rdata_toregion(rdata2, &region2);
@@ -306,6 +310,7 @@ tostruct_in_a6(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->type == 38);
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	a6->common.rdclass = rdata->rdclass;
 	a6->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index ace6c50b17..554df8ba14 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.38 2000/08/08 23:40:46 gson Exp $ */
+/* $Id: a_1.c,v 1.39 2000/10/25 05:44:01 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -103,6 +103,7 @@ towire_in_a(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 1);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length == 4);
 
 	UNUSED(cctx);
 
@@ -123,6 +124,8 @@ compare_in_a(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 1);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length == 4);
+	REQUIRE(rdata2->length == 4);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -156,6 +159,7 @@ tostruct_in_a(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 1);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length == 4);
 
 	UNUSED(mctx);
 
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index d3ace06ff7..5ee192d42e 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aaaa_28.c,v 1.28 2000/08/01 01:26:20 tale Exp $ */
+/* $Id: aaaa_28.c,v 1.29 2000/10/25 05:44:02 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -103,6 +103,7 @@ towire_in_aaaa(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 28);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length == 16);
 
 	isc_buffer_availableregion(target, &region);
 	if (region.length < rdata->length)
@@ -121,6 +122,8 @@ compare_in_aaaa(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 28);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length == 16);
+	REQUIRE(rdata2->length == 16);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -148,6 +151,7 @@ tostruct_in_aaaa(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->type == 28);
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length == 16);
 
 	UNUSED(mctx);
 
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index 7c25658321..1a986f0a46 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: kx_36.c,v 1.29 2000/08/01 01:26:22 tale Exp $ */
+/* $Id: kx_36.c,v 1.30 2000/10/25 05:44:04 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
 
@@ -58,6 +58,7 @@ totext_in_kx(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 36);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -102,6 +103,7 @@ towire_in_kx(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 36);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_rdata_toregion(rdata, &region);
@@ -126,6 +128,8 @@ compare_in_kx(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 36);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	order = memcmp(rdata1->data, rdata2->data, 2);
 	if (order != 0)
@@ -171,6 +175,7 @@ tostruct_in_kx(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->type == 36);
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	kx->common.rdclass = rdata->rdclass;
 	kx->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index c5157e5eff..8d1a38ad44 100644
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.33 2000/08/01 01:26:25 tale Exp $ */
+/* $Id: naptr_35.c,v 1.34 2000/10/25 05:44:05 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -90,6 +90,7 @@ totext_in_naptr(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 35);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -189,6 +190,7 @@ towire_in_naptr(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 35);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	/*
@@ -236,6 +238,8 @@ compare_in_naptr(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 35);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &region1);
 	dns_rdata_toregion(rdata2, &region2);
@@ -330,6 +334,7 @@ tostruct_in_naptr(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->type == 35);
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	naptr->common.rdclass = rdata->rdclass;
 	naptr->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 72611f1f48..c0d98e3618 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap-ptr_23.c,v 1.24 2000/08/01 01:26:27 tale Exp $ */
+/* $Id: nsap-ptr_23.c,v 1.25 2000/10/25 05:44:06 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
 
@@ -52,6 +52,7 @@ totext_in_nsap_ptr(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 23);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -84,6 +85,7 @@ towire_in_nsap_ptr(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 23);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	dns_name_init(&name, NULL);
@@ -104,6 +106,8 @@ compare_in_nsap_ptr(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 23);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_name_init(&name1, NULL);
 	dns_name_init(&name2, NULL);
@@ -141,6 +145,7 @@ tostruct_in_nsap_ptr(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->type == 23);
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	nsap_ptr->common.rdclass = rdata->rdclass;
 	nsap_ptr->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 1b86674a5f..e23c76385c 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.25 2000/08/01 01:26:29 tale Exp $ */
+/* $Id: nsap_22.c,v 1.26 2000/10/25 05:44:07 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 
@@ -78,6 +78,7 @@ totext_in_nsap(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 22);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	UNUSED(tctx);
 
@@ -114,6 +115,7 @@ static inline isc_result_t
 towire_in_nsap(ARGS_TOWIRE) {
 	REQUIRE(rdata->type == 22);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	UNUSED(cctx);
 
@@ -129,6 +131,8 @@ compare_in_nsap(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 22);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -158,6 +162,7 @@ tostruct_in_nsap(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->type == 22);
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	nsap->common.rdclass = rdata->rdclass;
 	nsap->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index ef571e48cb..38c82eb3aa 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: px_26.c,v 1.26 2000/08/01 01:26:31 tale Exp $ */
+/* $Id: px_26.c,v 1.27 2000/10/25 05:44:08 marka Exp $ */
 
 /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
 
@@ -73,6 +73,7 @@ totext_in_px(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 26);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -143,6 +144,7 @@ towire_in_px(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 26);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	/*
@@ -180,6 +182,8 @@ compare_in_px(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 26);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	order = memcmp(rdata1->data, rdata2->data, 2);
 	if (order != 0)
@@ -238,6 +242,7 @@ tostruct_in_px(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->type == 26);
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	px->common.rdclass = rdata->rdclass;
 	px->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 25155abaf9..dcbc10a7df 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: srv_33.c,v 1.28 2000/08/01 01:26:34 tale Exp $ */
+/* $Id: srv_33.c,v 1.29 2000/10/25 05:44:09 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 
@@ -80,6 +80,7 @@ totext_in_srv(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 33);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_name_init(&name, NULL);
 	dns_name_init(&prefix, NULL);
@@ -153,6 +154,7 @@ towire_in_srv(ARGS_TOWIRE) {
 	isc_region_t sr;
 
 	REQUIRE(rdata->type == 33);
+	REQUIRE(rdata->length != 0);
 
 	dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
 	/*
@@ -182,6 +184,8 @@ compare_in_srv(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 33);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	/*
 	 * Priority, weight, port.
@@ -235,6 +239,7 @@ tostruct_in_srv(ARGS_TOSTRUCT) {
 	REQUIRE(rdata->rdclass == 1);
 	REQUIRE(rdata->type == 33);
 	REQUIRE(target != NULL);
+	REQUIRE(rdata->length != 0);
 
 	srv->common.rdclass = rdata->rdclass;
 	srv->common.rdtype = rdata->type;
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 33d9c06f9c..7a82977c0e 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.35 2000/08/24 21:41:44 gson Exp $ */
+/* $Id: wks_11.c,v 1.36 2000/10/25 05:44:10 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -143,6 +143,7 @@ totext_in_wks(ARGS_TOTEXT) {
 
 	REQUIRE(rdata->type == 11);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 	isc_buffer_availableregion(target, &tr);
@@ -206,6 +207,7 @@ towire_in_wks(ARGS_TOWIRE) {
 
 	REQUIRE(rdata->type == 11);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	dns_rdata_toregion(rdata, &sr);
 	return (mem_tobuffer(target, sr.base, sr.length));
@@ -220,6 +222,8 @@ compare_in_wks(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 11);
 	REQUIRE(rdata1->rdclass == 1);
+	REQUIRE(rdata1->length != 0);
+	REQUIRE(rdata2->length != 0);
 
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
@@ -251,6 +255,7 @@ tostruct_in_wks(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 11);
 	REQUIRE(rdata->rdclass == 1);
+	REQUIRE(rdata->length != 0);
 
 	wks->common.rdclass = rdata->rdclass;
 	wks->common.rdtype = rdata->type;