SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

time-util: make parse_timestamp() return -EINVAL if the input is very old date (#6327)

Browse Source 
This reverts 7635ab8e74 and makes parse_timestamp()
return -EINVAL if the input is older than 1970-01-01.

Fixes #6290.
This commit is contained in:
Yu Watanabe
2017-07-11 19:12:48 +02:00
committed by Lennart Poettering
parent 634735b56b
commit 68bdd2d2d3
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/time-util.c
+7 -11
View File
@@ -241,7 +241,7 @@ usec_t timeval_load(const struct timeval *tv) {
struct timeval *timeval_store(struct timeval *tv, usec_t u) {
assert(tv);
if (u == USEC_INFINITY||
if (u == USEC_INFINITY ||
u / USEC_PER_SEC > TIME_T_MAX) {
tv->tv_sec = (time_t) -1;
tv->tv_usec = (suseconds_t) -1;
@@ -847,31 +847,27 @@ parse_usec:
from_tm:
x = mktime_or_timegm(&tm, utc);
if (x == (time_t) -1)
return -EOVERFLOW;
if (x < 0)
return -EINVAL;
if (weekday >= 0 && tm.tm_wday != weekday)
return -EINVAL;
if (x < 0)
ret = 0;
else
ret = (usec_t) x * USEC_PER_SEC + x_usec;
ret = (usec_t) x * USEC_PER_SEC + x_usec;
if (ret > USEC_TIMESTAMP_FORMATTABLE_MAX)
return -EINVAL;
finish:
if (ret + plus < ret) /* overflow? */
return -EOVERFLOW;
return -EINVAL;
ret += plus;
if (ret > USEC_TIMESTAMP_FORMATTABLE_MAX)
return -EINVAL;
if (ret > minus)
if (ret >= minus)
ret -= minus;
else
ret = 0;
return -EINVAL;
*usec = ret;