Fix test errors with ubsan

1 files changed, 12 insertions, 6 deletions

diff --git a/src/cookie_helper.cc b/src/cookie_helper.cc
index 0e546109..8ad1e518 100644
--- a/src/cookie_helper.cc
+++ b/src/cookie_helper.cc
@@ -300,12 +300,18 @@ std::unique_ptr<Cookie> parse(const std::string& cookieStr,
         }
         else {
           int64_t n = creationTime;
-          n += delta;
-          if (n < 0 || std::numeric_limits<time_t>::max() < n) {
-            maxAge = std::numeric_limits<time_t>::max();
-          }
-          else {
-            maxAge = n;
+
+          if (n > std::numeric_limits<int64_t>::max() - delta) {
+            maxAge = std::numeric_limits<int64_t>::max();
+          } else {
+            n += delta;
+
+            if (n < 0 || std::numeric_limits<time_t>::max() < n) {
+              maxAge = std::numeric_limits<time_t>::max();
+            }
+            else {
+              maxAge = n;
+            }
           }
         }
       }