Skip to content

gh-112804: Clamping timeout value for _PySemaphore_PlatformWait #124914

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 3 commits into from
Oct 5, 2024
Merged

gh-112804: Clamping timeout value for _PySemaphore_PlatformWait #124914

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cc71a5
gh-112804: Clamping timeout value for _PySemaphore_PlatformWait
corona10 Oct 1, 2024
68d2336
Address code review
corona10 Oct 3, 2024
d629976
nit
corona10 Oct 3, 2024
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
5 changes: 3 additions & 2 deletions Python/parking_lot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,13 @@ _PySemaphore_PlatformWait(_PySemaphore *sema, PyTime_t timeout)
millis = INFINITE;
}
else {
PyTime_t div = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_TIMEOUT);
// Prevent overflow with clamping the result
if ((PyTime_t)PY_DWORD_MAX * 1000000 < timeout) {
if ((PyTime_t)PY_DWORD_MAX * 1000000 < div) {
millis = PY_DWORD_MAX;
}
else {
millis = (DWORD) (timeout / 1000000);
millis = (DWORD) div;
}
}
wait = WaitForSingleObjectEx(sema->platform_sem, millis, FALSE);
Expand Down
Loading