[Bug 3842] Windows ntpd ppsapi DLL load failure crashes.

bk: 64c6e0baR35M6TZ4MCfqC0SFD-Bs_A

diff --git a/ChangeLog b/ChangeLog
index b04fac44170dc9fb93ccde7b3b459168f565031b..b0b9dccfb8e49c0c9376ba0bf618b024ee037dc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 * [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid.
              <hart@ntp.org>
 * [Bug 3846] Use -Wno-format-truncation by default.
+* [Bug 3842] Windows ntpd ppsapi DLL load failure crashes. <hart@ntp.org>
 * [Bug 3841] 4.2.8p17 build break w/ gcc 12 -Wformat-security without -Wformat
              Need to remove --Wformat-security when removing -Wformat to
              silence numerous libopts warnings.  <hart@ntp.org>

diff --git a/ports/winnt/ntpd/nt_ppsimpl.c b/ports/winnt/ntpd/nt_ppsimpl.c
index 632349a4f3edf9ea46191a43d2a3b7a99b39d6f1..be1898d49310442d1539146bfd8feea767adf950 100644 (file)
--- a/ports/winnt/ntpd/nt_ppsimpl.c
+++ b/ports/winnt/ntpd/nt_ppsimpl.c
@@ -456,7 +456,7 @@ load_pps_provider(
        HMODULE                 hmod;
        pppsapi_prov_init       pprov_init;
 
-       prov = emalloc(sizeof(*prov));
+       prov = emalloc_zero(sizeof(*prov));
        hmod = LoadLibraryA(dllpath);
        if (NULL == hmod) {
                msyslog(LOG_WARNING, msgfmt, dllpath,