[3.13] pythongh-112804: Clamping timeout value for _PySemaphore_Platf…

…ormWait (pythongh-124914) (pythongh-124991) pythongh-112804: Clamping timeout value for _PySemaphore_PlatformWait (pythongh-124914) * pythongh-112804: Clamping timeout value for _PySemaphore_PlatformWait * Address code review * nit (cherry picked from commit a5fc509) Co-authored-by: Donghee Na <[email protected]>
ambv · Oct 7, 2024 · 80ba17a · 80ba17a
1 parent 8bc8d21
commit 80ba17a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Python/parking_lot.c b/Python/parking_lot.c
@@ -102,7 +102,14 @@ _PySemaphore_PlatformWait(_PySemaphore *sema, PyTime_t timeout)
         millis = INFINITE;
     }
     else {
-        millis = (DWORD) (timeout / 1000000);
+        PyTime_t div = _PyTime_AsMilliseconds(timeout, _PyTime_ROUND_TIMEOUT);
+        // Prevent overflow with clamping the result
+        if ((PyTime_t)PY_DWORD_MAX < div) {
+            millis = PY_DWORD_MAX;
+        }
+        else {
+            millis = (DWORD) div;
+        }
     }
     wait = WaitForSingleObjectEx(sema->platform_sem, millis, FALSE);
     if (wait == WAIT_OBJECT_0) {