Fix overflow in TimeSpec addition on 32-bit architectures (#1074)

apple · Oct 27, 2022 · 970bfdd · 970bfdd
1 parent b8385e7
commit 970bfdd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Sources/DistributedCluster/TimeSpec.swift b/Sources/DistributedCluster/TimeSpec.swift
@@ -45,15 +45,14 @@ extension TimeSpec {
     @usableFromInline
     internal static func + (a: timespec, b: timespec) -> timespec {
         let totalNanos = a.toNanos() + b.toNanos()
-        let seconds = totalNanos / NANOS
         var result = timespec()
-        result.tv_sec = seconds
-        result.tv_nsec = totalNanos % NANOS
+        result.tv_sec = Int(totalNanos / Int64(NANOS))
+        result.tv_nsec = Int(totalNanos % Int64(NANOS))
         return result
     }
 
     @usableFromInline
-    internal func toNanos() -> Int {
-        self.tv_nsec + (self.tv_sec * NANOS)
+    internal func toNanos() -> Int64 {
+        Int64(self.tv_nsec) + (Int64(self.tv_sec) * Int64(NANOS))
     }
 }
diff --git a/Tests/DistributedClusterTests/TimeSpecTests.swift b/Tests/DistributedClusterTests/TimeSpecTests.swift
@@ -38,7 +38,7 @@ class TimeSpecTests: XCTestCase {
     }
 
     func test_timeSpecShouldBeCreatedProperlyFromDuration() {
-        self.total.toNanos().shouldEqual(Int(self.totalDuration.nanoseconds))
+        self.total.toNanos().shouldEqual(Int64(self.totalDuration.nanoseconds))
         self.total.tv_sec.shouldEqual(Int(self.totalDuration.nanoseconds) / NANOS)
         self.total.tv_nsec.shouldEqual(Int(self.totalDuration.nanoseconds) % NANOS)
     }