Add changes for [GL #1989]

(cherry picked from commit 42b2290c3a20c09663a8145e0ea8938def62a56e)

diff --git a/CHANGES b/CHANGES
index 22427b6f6f2d071bc306d3c972fbc8806f489d71..ecd9359d2cc9cf933e0a02df994e9ed272aae917 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5464.  [bug]           Specifying saving more than 128 files when rolling
+                       dnstap / log files would cause buffer overflow.
+                       [GL #1989]
+
 5462.  [bug]           Move LMDB locking from LMDB itself to named. [GL #1976]
 
 5461.  [bug]           The header STALE attribute was not being updated with

diff --git a/lib/isc/log.c b/lib/isc/log.c
index f43fb66978d5a04b18887f7ead8f224f60fb4071..12116f2ad598b3fa6955758b68c870d5e96d19f9 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1177,7 +1177,8 @@ remove_old_tsversions(isc_logfile_t *file, int versions) {
                                                memmove(&to_keep[i + 1],
                                                        &to_keep[i],
                                                        sizeof(to_keep[0]) *
-                                                       (versions - i - 1));
+                                                               (versions - i -
+                                                                1));
                                                to_keep[i] = version;
                                        }
                                }