Pi-Hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2025-12-20 04:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2684 from pi-hole/fix/ntp_error_crash

Browse Source 
Fix crash in NTP error handling code
This commit is contained in:
Dominik
2025-10-31 20:12:22 +01:00
committed by GitHub
parent f31b28a2c0 28f2519555
commit bfa8f89aec
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ntp/client.c
View File

@@ -494,7 +494,8 @@ bool ntp_client(const char *server, const bool settime, const bool print)
} }
errbuf[sizeof(errbuf) - 1] = '\0'; errbuf[sizeof(errbuf) - 1] = '\0';
log_ntp_message(true, false, errbuf); log_ntp_message(true, false, errbuf);
freeaddrinfo(saddr); if(saddr != NULL)
freeaddrinfo(saddr);
return false; return false;
} }
@@ -503,7 +504,8 @@ bool ntp_client(const char *server, const bool settime, const bool print)
if(ntp == NULL) if(ntp == NULL)
{ {
log_err("Cannot allocate memory for NTP client"); log_err("Cannot allocate memory for NTP client");
freeaddrinfo(saddr); if(saddr != NULL)
freeaddrinfo(saddr);
return false; return false;
} }
@@ -520,7 +522,8 @@ bool ntp_client(const char *server, const bool settime, const bool print)
{ {
close(s); close(s);
free(ntp); free(ntp);
freeaddrinfo(saddr); if(saddr != NULL)
freeaddrinfo(saddr);
return false; return false;
} }
// Get reply // Get reply
@@ -543,7 +546,8 @@ bool ntp_client(const char *server, const bool settime, const bool print)
printf("\n"); printf("\n");
// Free allocated memory // Free allocated memory
freeaddrinfo(saddr); if(saddr != NULL)
freeaddrinfo(saddr);
saddr = NULL; saddr = NULL;
// Compute average and standard deviation // Compute average and standard deviation