emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle gettimeofday() errors the same way everywhere

Browse Source 
Problem found by Coverity Scan.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg 2022-07-30 21:01:49 +02:00
parent ef67ecae12
commit 70bfb8ed98
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/syslogd.c
View File

@ -1161,8 +1161,10 @@ parsemsg_rfc3164(const char *from, int pri, char *msg)
msg += RFC3164_DATELEN + 1; msg += RFC3164_DATELEN + 1;
if (gettimeofday(&tv, NULL)) if (gettimeofday(&tv, NULL) == -1) {
tv.tv_sec = time(NULL);
tv.tv_usec = 0; tv.tv_usec = 0;
}
if (!RemoteAddDate) { if (!RemoteAddDate) {
time_t t_now, t_remote; time_t t_now, t_remote;
@ -1379,8 +1381,11 @@ void printsys(char *msg)
struct timeval tv; struct timeval tv;
now = time(NULL); now = time(NULL);
if (!gettimeofday(&tv, NULL)) if (gettimeofday(&tv, NULL) == -1) {
ustime = tv.tv_usec * 1000000; tv.tv_sec = time(NULL);
tv.tv_usec = 0;
}
ustime = tv.tv_usec * 1000000;
} }
localtime_r(&now, &buffer.timestamp.tm); localtime_r(&now, &buffer.timestamp.tm);
@ -1465,8 +1470,10 @@ static void check_timestamp(struct buf_msg *buffer)
if (memcmp(&buffer->timestamp, &zero, sizeof(zero))) if (memcmp(&buffer->timestamp, &zero, sizeof(zero)))
return; return;
if (gettimeofday(&tv, NULL) == -1) if (gettimeofday(&tv, NULL) == -1) {
return; tv.tv_sec = time(NULL);
tv.tv_usec = 0;
}
localtime_r(&tv.tv_sec, &now.tm); localtime_r(&tv.tv_sec, &now.tm);
now.usec = tv.tv_usec; now.usec = tv.tv_usec;
@ -2537,7 +2544,10 @@ static void boot_time_init(void)
struct sysinfo si; struct sysinfo si;
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); if (gettimeofday(&tv, NULL) == -1) {
tv.tv_sec = time(NULL);
tv.tv_usec = 0;
}
sysinfo(&si); sysinfo(&si);
boot_time = tv.tv_sec - si.uptime; boot_time = tv.tv_sec - si.uptime;
#endif #endif