From: Arran Cudbard-Bell Date: Wed, 25 Aug 2021 02:50:03 +0000 (-0500) Subject: Our version of unix time can't be negaitve X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=294f6aec7f84e4c1554b856e9bcc94df5790c7ac;p=thirdparty%2Ffreeradius-server.git Our version of unix time can't be negaitve --- diff --git a/src/lib/util/time.h b/src/lib/util/time.h index 705b12e5cf1..dbb147d2970 100644 --- a/src/lib/util/time.h +++ b/src/lib/util/time.h @@ -99,10 +99,10 @@ extern uint64_t our_mach_epoch; /* * Need cast because of difference in sign */ -#define fr_unix_time_from_nsec(_x) (fr_unix_time_t)(_x) -#define fr_unix_time_from_usec(_x) (fr_unix_time_t)fr_time_delta_from_usec((fr_time_delta_t)(_x)) -#define fr_unix_time_from_msec(_x) (fr_unix_time_t)fr_time_delta_from_msec((fr_time_delta_t)(_x)) -#define fr_unix_time_from_sec(_x) (fr_unix_time_t)fr_time_delta_from_sec((fr_time_delta_t)(_x)) +#define fr_unix_time_from_nsec(_x) ((_x) < 0 ? 0 : (fr_unix_time_t)(_x)) +#define fr_unix_time_from_usec(_x) ((_x) < 0 ? 0 : (fr_unix_time_t)fr_time_delta_from_usec((fr_time_delta_t)(_x))) +#define fr_unix_time_from_msec(_x) ((_x) < 0 ? 0 : (fr_unix_time_t)fr_time_delta_from_msec((fr_time_delta_t)(_x))) +#define fr_unix_time_from_sec(_x) ((_x) < 0 ? 0 : (fr_unix_time_t)fr_time_delta_from_sec((fr_time_delta_t)(_x))) #define fr_unix_time_to_nsec(_x) (uint64_t)(_x) #define fr_unix_time_to_usec(_x) (uint64_t)fr_time_delta_to_usec(_x)