From: Mark Andrews <marka@isc.org>
Date: Thu, 2 Jul 2020 03:35:27 +0000 (+1000)
Subject: Add changes for [GL #1989]
X-Git-Tag: v9.17.4~56^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42b2290c3a20c09663a8145e0ea8938def62a56e;p=thirdparty%2Fbind9.git

Add changes for [GL #1989]
---

diff --git a/CHANGES b/CHANGES
index 2403831aed2..de17a40db21 100644
--- 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]
+
 5463.	[placeholder]
 
 5462.	[bug]		Move LMDB locking from LMDB itself to named. [GL #1976]
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 9970431ba3b..dc605d3e8dc 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1180,7 +1180,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;
 					}
 				}