Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions stdlib/public/Concurrency/DispatchGlobalExecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,9 @@ void swift_dispatchEnqueueWithDeadline(bool global,
}

uint64_t deadline;
if (__builtin_mul_overflow(sec, NSEC_PER_SEC, &deadline)
if (sec < 0 || sec == 0 && nsec < 0)
deadline = 0;
else if (__builtin_mul_overflow(sec, NSEC_PER_SEC, &deadline)
|| __builtin_add_overflow(nsec, deadline, &deadline)) {
deadline = UINT64_MAX;
}
Expand All @@ -342,8 +344,10 @@ void swift_dispatchEnqueueWithDeadline(bool global,

if (tnsec != -1) {
uint64_t leeway;
if (__builtin_mul_overflow(tsec, NSEC_PER_SEC, &leeway)
|| __builtin_add_overflow(tnsec, leeway, &leeway)) {
if (tsec < 0 || tsec == 0 && tnsec < 0)
leeway = 0;
else if (__builtin_mul_overflow(tsec, NSEC_PER_SEC, &leeway)
|| __builtin_add_overflow(tnsec, leeway, &leeway)) {
leeway = UINT64_MAX;
}

Expand Down