From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:39:27 +0000 (-0700)
Subject: gh-74953: Fix PyThread_acquire_lock_timed() code recomputing the timeout (GH-93941)
X-Git-Tag: v3.11.0b4~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1353b8a4bcef22d985a0b6a186c96439fd540ea8;p=thirdparty%2FPython%2Fcpython.git

gh-74953: Fix PyThread_acquire_lock_timed() code recomputing the timeout (GH-93941)


Set timeout, don't create a local variable with the same name.
(cherry picked from commit f64557f4803528c53bb9a1d565e3cdf92e97152f)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index c90ab25d4841..02c842772954 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -506,7 +506,7 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
 #ifndef HAVE_SEM_CLOCKWAIT
         if (timeout > 0) {
             /* wait interrupted by a signal (EINTR): recompute the timeout */
-            _PyTime_t timeout = _PyDeadline_Get(deadline);
+            timeout = _PyDeadline_Get(deadline);
             if (timeout < 0) {
                 status = ETIMEDOUT;
                 break;