From: Victor Stinner Date: Fri, 17 Jun 2022 14:11:25 +0000 (+0200) Subject: gh-74953: Fix PyThread_acquire_lock_timed() code recomputing the timeout (#93941) X-Git-Tag: v3.12.0a1~1223 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f64557f4803528c53bb9a1d565e3cdf92e97152f;p=thirdparty%2FPython%2Fcpython.git gh-74953: Fix PyThread_acquire_lock_timed() code recomputing the timeout (#93941) Set timeout, don't create a local variable with the same name. --- diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 195b277dfba5..58b5999add38 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -497,7 +497,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;