From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 15 Sep 2024 13:04:04 +0000 (+0200)
Subject: time-util: use saturate_add for usec_add()
X-Git-Tag: v257-rc1~251^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=407bfa0db647c9afaaff3f3eb8cb990084535a1a;p=thirdparty%2Fsystemd.git

time-util: use saturate_add for usec_add()
---

diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 7d5a1b7b78a..14d660ee7e9 100644
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -188,11 +188,7 @@ bool in_utc_timezone(void);
 static inline usec_t usec_add(usec_t a, usec_t b) {
         /* Adds two time values, and makes sure USEC_INFINITY as input results as USEC_INFINITY in output,
          * and doesn't overflow. */
-
-        if (a > USEC_INFINITY - b) /* overflow check */
-                return USEC_INFINITY;
-
-        return a + b;
+        return saturate_add(a, b, USEC_INFINITY);
 }
 
 static inline usec_t usec_sub_unsigned(usec_t timestamp, usec_t delta) {