From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 14 Nov 2014 08:54:11 +0000 (+0000)
Subject: [Bug 2661] ntpq crashes with mreadvar
X-Git-Tag: NTP_4_2_7P478~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3853e8000cd68d491a17e7a877b0af8e761da397;p=thirdparty%2Fntp.git

[Bug 2661] ntpq crashes with mreadvar

bk: 5465c333ozso-E4wg5EIeOrfwLma8Q
---

diff --git a/ChangeLog b/ChangeLog
index 41c568ac7..26aa3f517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2661] ntpq crashes with mreadvar.
 (4.2.7p477) 2014/11/13 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2657] Document that "restrict nopeer" intereferes with "pool".
 (4.2.7p476) 2014/10/08 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpq/ntpq-subs.c b/ntpq/ntpq-subs.c
index 9c6edfa49..5460f80fc 100644
--- a/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@ -1030,8 +1030,8 @@ mreadvar(
 				&from, &to, fp))
 		return;
 
+	ZERO(tmplist);
 	if (pcmd->nargs >= 3) {
-		ZERO(tmplist);
 		doaddvlist(tmplist, pcmd->argval[2].string);
 		pvars = tmplist;
 	} else {