Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Sources/DistributedCluster/TimeSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
2 changes: 1 addition & 1 deletion Tests/DistributedClusterTests/TimeSpecTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down