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

time-util: mktime_or_timegm are changing the struct tm

Browse source 
after that wm_day etc. seems to be changed. Moving the check infront of
the mktime_or_timegm fixes that.
This commit is contained in:
Marcel Hollerbach 2017-09-20 19:26:13 +02:00
parent 3fd4929b96
commit 214cc95d7b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/basic/time-util.c
View file

@ -849,11 +849,11 @@ parse_usec:
}
from_tm:
x = mktime_or_timegm(&tm, utc);
if (x < 0)
if (weekday >= 0 && tm.tm_wday != weekday)
return -EINVAL;
if (weekday >= 0 && tm.tm_wday != weekday)
x = mktime_or_timegm(&tm, utc);
if (x < 0)
return -EINVAL;
ret = (usec_t) x * USEC_PER_SEC + x_usec;