DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-03 16:35:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

check values returned by gmtime() and localtime()

Browse Source 
While it is not expected to happen with any time that can be represented
by the system clock, the functions are allowed to return NULL. Check the
pointer before dereferencing.

This issue was found in a Frama-C analysis.
This commit is contained in:
Miroslav Lichvar
2018-06-20 12:11:55 +02:00
parent 85465afb62
commit 63fe34e890
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtc_linux.c
View File

@@ -352,7 +352,7 @@ rtc_from_t(const time_t *t)
static time_t
t_from_rtc(struct tm *stm) {
struct tm temp1, temp2;
struct tm temp1, temp2, *tm;
long diff;
time_t t1, t2;
@@ -360,12 +360,14 @@ t_from_rtc(struct tm *stm) {
temp1.tm_isdst = 0;
t1 = mktime(&temp1);
if (rtc_on_utc) {
temp2 = *gmtime(&t1);
} else {
temp2 = *localtime(&t1);
tm = rtc_on_utc ? gmtime(&t1) : localtime(&t1);
if (!tm) {
DEBUG_LOG("gmtime()/localtime() failed");
return -1;
}
temp2 = *tm;
temp2.tm_isdst = 0;
t2 = mktime(&temp2);
diff = t2 - t1;