From: Harlan Stenn Date: Tue, 7 Jun 2011 06:25:51 +0000 (-0400) Subject: [Bug 1938] addr_eqprefix() doesn't clear enough storage X-Git-Tag: NTP_4_2_7P181~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8569948116e81ace5ca0ea429798ab51340b8277;p=thirdparty%2Fntp.git [Bug 1938] addr_eqprefix() doesn't clear enough storage bk: 4dedc46fqNw_-BaQtPkjI-2cDzWd_g --- diff --git a/ChangeLog b/ChangeLog index 5de0873a4..f5dbbb585 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* [Bug 1938] addr_eqprefix() doesn't clear enough storage. (4.2.7p180) 2011/06/06 Released by Harlan Stenn * Upgrade to libevent-2.0.12. (4.2.7p179) 2011/06/03 Released by Harlan Stenn diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c index 7f93f2c6e..4f719558f 100644 --- a/ntpd/ntp_io.c +++ b/ntpd/ntp_io.c @@ -615,12 +615,12 @@ addr_eqprefix( ZERO(isc_sa); memcpy(&isc_sa.type.sa, &a->sa, - min(sizeof(isc_sa.type), sizeof(a))); + min(sizeof(isc_sa.type), sizeof(*a))); isc_netaddr_fromsockaddr(&isc_a, &isc_sa); ZERO(isc_sa); memcpy(&isc_sa.type.sa, &b->sa, - min(sizeof(isc_sa.type), sizeof(b))); + min(sizeof(isc_sa.type), sizeof(*b))); isc_netaddr_fromsockaddr(&isc_b, &isc_sa); return (int)isc_netaddr_eqprefix(&isc_a, &isc_b,