From: Mark Andrews <marka@isc.org>
Date: Tue, 11 May 2004 22:20:13 +0000 (+0000)
Subject: 1631.   [bug]           dns_journal_compact() could sometimes corrupt the
X-Git-Tag: v9.2.3rc4^3~27
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=78ef0ebab3a4039f8efc8afdb7ee4b936ffc34ca;p=thirdparty%2Fbind9.git

1631.   [bug]           dns_journal_compact() could sometimes corrupt the
                        journal. [RT #11124]
---

diff --git a/CHANGES b/CHANGES
index 93262bfc771..78a6f3b569e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1631.	[bug]		dns_journal_compact() could sometimes corrupt the
+			journal. [RT #11124]
+
 1630.	[placeholder]	queryperf-v6
 
 1629.	[placeholder]	rt8753
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index c6d052a8f43..95c8bc577a0 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.86 2004/03/05 05:09:20 marka Exp $ */
+/* $Id: journal.c,v 1.87 2004/05/11 22:20:13 marka Exp $ */
 
 #include <config.h>
 
@@ -2115,6 +2115,7 @@ index_to_disk(dns_journal_t *j) {
 		}
 		INSIST(p == j->rawindex + rawbytes);
 
+		CHECK(journal_seek(j, sizeof(journal_rawheader_t)));
 		CHECK(journal_write(j, j->rawindex, rawbytes));
 	}
 failure: