From 04a1d84cefe4dbb5bfee86190489c3c07a8c238c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 9 Feb 2016 19:55:04 +0100 Subject: util-lib: make sure usec_sub() doesn't degrade USEC_INFINITY As suggested in: https://github.com/systemd/systemd/pull/2542#issuecomment-181877820 --- src/basic/time-util.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/basic/time-util.h') diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 87440faeee..080c1110f5 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -143,11 +143,13 @@ static inline usec_t usec_add(usec_t a, usec_t b) { static inline usec_t usec_sub(usec_t timestamp, int64_t delta) { if (delta < 0) - timestamp = usec_add(timestamp, (usec_t) (-delta)); - else if (timestamp > (usec_t) delta) - timestamp -= delta; - else - timestamp = 0; + return usec_add(timestamp, (usec_t) (-delta)); - return timestamp; + if (timestamp == USEC_INFINITY) /* Make sure infinity doesn't degrade */ + return USEC_INFINITY; + + if (timestamp < (usec_t) delta) + return 0; + + return timestamp - delta; } -- cgit v1.2.3-54-g00ecf