[Bug 2661] ntpq crashes with mreadvar

bk: 5465c333ozso-E4wg5EIeOrfwLma8Q

diff --git a/ChangeLog b/ChangeLog
index 41c568ac76b86d8dafc2ce2f3da7957dcc7a0cff..26aa3f5175fbcf524c9dfcdcfc2392169b105a45 100644 (file)
--- 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 9c6edfa493dc21aad3a0c14f5ecb4331b21c7076..5460f80fc93af623829814efd646147fed26a776 100644 (file)
--- 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 {