1631. [bug] dns_journal_compact() could sometimes corrupt the

                        journal. [RT #11124]

diff --git a/CHANGES b/CHANGES
index 93262bfc7714ac4e8bbeea7d4eb0665803a270a3..78a6f3b569e89f776102b16402e45383b24122ec 100644 (file)
--- 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 c6d052a8f43a40081e2b7e8238ddfe12ddaa87a1..95c8bc577a058564442f23a216065c2704ace5ae 100644 (file)
--- 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: