From d301fa1cd7502f2b460905fc97e19ed7fa2172c2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 12 Jul 2017 02:12:48 +0900 Subject: [PATCH] time-util: make parse_timestamp() return -EINVAL if the input is very old date (#6327) This reverts 7635ab8e74ea4a94e81143c3077570a986df375c and makes parse_timestamp() return -EINVAL if the input is older than 1970-01-01. Fixes #6290. --- src/basic/time-util.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 397637f53..be0197f44 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -247,7 +247,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; @@ -860,31 +860,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; -- 2.30.2