[Bug 1938] addr_eqprefix() doesn't clear enough storage

bk: 4dedc46fqNw_-BaQtPkjI-2cDzWd_g

diff --git a/ChangeLog b/ChangeLog
index 5de0873a4ba337153eba8819f3b5f1b47fdb8461..f5dbbb5858977f78ff9b793991725507ec51c0a8 100644 (file)
--- 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 <stenn@ntp.org>
 * Upgrade to libevent-2.0.12.
 (4.2.7p179) 2011/06/03 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 7f93f2c6ef17e3c1df5aa8f69802e8a23b9f349a..4f719558f70392f49f4d71e467168e4c93735df9 100644 (file)
--- 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,