From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 17 Jul 2013 09:23:29 +0000 (-0400)
Subject: [Bug 2428] do_unconf() should reset 'items' before the 2nd loop
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66286cd359ed638307a71025ea27e541e2a66119;p=thirdparty%2Fntp.git

[Bug 2428] do_unconf() should reset 'items' before the 2nd loop

bk: 51e66291HAzW3NA3V5VmeMCQDj10dg
---

diff --git a/ChangeLog b/ChangeLog
index a80111b2d4..3644b3e742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 * [Bug 1466] Oncore should set FLAG_PPS.
 * [Bug 2375] AIX 7 doesn't like a libevent validation check.
 * [Bug 2423] Log command-line args at LOG_INFO.
+* [Bug 2428] do_unconf() should reset 'items' before the 2nd loop.
 (4.2.7p371) 2013/07/07 Released by Harlan Stenn <stenn@ntp.org>
 * CID 1042586: Check the return value of clock_gettime() in worker_sleep().
 * Upgrade to libopts-39.0.14 from 5.17.5pre10.
diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c
index 5a961e7192..e11adc4022 100644
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@ -1449,6 +1449,7 @@ do_unconf(
 	 * Now do it in earnest.
 	 */
 
+	items = INFO_NITEMS(inpkt->err_nitems);
 	datap = inpkt->u.data;
 
 	while (items-- > 0) {