picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

timedate: use gmtime_r() and localtime_r()

Browse source 
gmtime() and localtime() operate on a static buffer. let's avoid this,
as we never know whether some library might use these calls in some
backrgound thread.

Discovered by lgtm:

https://lgtm.com/projects/g/systemd/systemd/
This commit is contained in:
Lennart Poettering 2018-06-25 14:29:25 +02:00
parent e49807606d
commit e46acb7950
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/timedate/timedated.c
View file

@ -632,9 +632,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
/* Sync system clock from RTC; first, initialize the timezone fields of struct tm. */ /* Sync system clock from RTC; first, initialize the timezone fields of struct tm. */
if (c->local_rtc) if (c->local_rtc)
tm = *localtime(&ts.tv_sec); localtime_r(&ts.tv_sec, &tm);
else else
tm = *gmtime(&ts.tv_sec); gmtime_r(&ts.tv_sec, &tm);
/* Override the main fields of struct tm, but not the timezone fields */ /* Override the main fields of struct tm, but not the timezone fields */
r = clock_get_hwclock(&tm); r = clock_get_hwclock(&tm);
@ -652,15 +652,15 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
} }
} else { } else {
struct tm *tm; struct tm tm;
/* Sync RTC from system clock */ /* Sync RTC from system clock */
if (c->local_rtc) if (c->local_rtc)
tm = localtime(&ts.tv_sec); localtime_r(&ts.tv_sec, &tm);
else else
tm = gmtime(&ts.tv_sec); gmtime_r(&ts.tv_sec, &tm);
r = clock_set_hwclock(tm); r = clock_set_hwclock(&tm);
if (r < 0) if (r < 0)
log_debug_errno(r, "Failed to sync time to hardware clock, ignoring: %m"); log_debug_errno(r, "Failed to sync time to hardware clock, ignoring: %m");
} }
@ -679,7 +679,7 @@ static int method_set_time(sd_bus_message *m, void *userdata, sd_bus_error *erro
int64_t utc; int64_t utc;
struct timespec ts; struct timespec ts;
usec_t start; usec_t start;
struct tm* tm; struct tm tm;
assert(m); assert(m);
assert(c); assert(c);
@ -748,11 +748,11 @@ static int method_set_time(sd_bus_message *m, void *userdata, sd_bus_error *erro
/* Sync down to RTC */ /* Sync down to RTC */
if (c->local_rtc) if (c->local_rtc)
tm = localtime(&ts.tv_sec); localtime_r(&ts.tv_sec, &tm);
else else
tm = gmtime(&ts.tv_sec); gmtime_r(&ts.tv_sec, &tm);
r = clock_set_hwclock(tm); r = clock_set_hwclock(&tm);
if (r < 0) if (r < 0)
log_debug_errno(r, "Failed to update hardware clock, ignoring: %m"); log_debug_errno(r, "Failed to update hardware clock, ignoring: %m");