pullup:

 371.   [bug]           At high debug levels, doing an outgoing zone transfer
                        of a very large RRset could cause an assertion failure
                        during logging.

diff --git a/CHANGES b/CHANGES
index ba8d410ccf8f325c339a0e615fb54b1bb668e6bb..c55d71ee4263cf1e678460254450fcc47e5bbde3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
        --- 9.0.0rc2 released ---
 
+ 371.  [bug]           At high debug levels, doing an outgoing zone transfer
+                       of a very large RRset could cause an assertion failure
+                       during logging.
+
  370.  [bug]           The error messages for rollforward failures were
                        overly terse.
 

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 6412267bde7db372248a9897e97f8de3a57baac5..6a4ab8649dab0baf8f73a37e5e97facab6079fba 100644 (file)
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.68 2000/06/15 04:41:59 marka Exp $ */
+/* $Id: xfrout.c,v 1.68.2.1 2000/08/07 22:04:31 gson Exp $ */
 
 #include <config.h>
 
@@ -263,15 +263,16 @@ log_rr(dns_name_t *name, dns_rdata_t *rdata, isc_uint32_t ttl) {
        result = dns_rdataset_totext(&rds, name,
                                     ISC_FALSE, ISC_FALSE, &buf);
 
-       /* Get rid of final newline. */
-       INSIST(buf.used >= 1 && ((char *) buf.base)[buf.used-1] == '\n');
-       buf.used--;
-
        /*
         * We could use xfrout_log(), but that would produce
         * very long lines with a repetitive prefix.
         */
        if (result == ISC_R_SUCCESS) {
+               /* Get rid of final newline. */
+               INSIST(buf.used >= 1 &&
+                      ((char *) buf.base)[buf.used-1] == '\n');
+               buf.used--;
+               
                isc_buffer_usedregion(&buf, &r);
                isc_log_write(XFROUT_DEBUG_LOGARGS(8),
                              "%.*s", (int) r.length, (char *) r.base);