diff options
| author | Ariel Eizenberg <ariel.eizenberg@gmail.com> | 2023-07-06 07:02:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-06 07:02:22 (GMT) |
| commit | 99b00efd5edfd5b26bf9e2a35cbfc96277fdcbb1 (patch) | |
| tree | 8971803238cccdeca86b861735a579b47770f664 | |
| parent | 38aa89a52ed5194f70bbf07d699a2dd3720e2efd (diff) | |
| download | cpython-99b00efd5edfd5b26bf9e2a35cbfc96277fdcbb1.zip cpython-99b00efd5edfd5b26bf9e2a35cbfc96277fdcbb1.tar.gz cpython-99b00efd5edfd5b26bf9e2a35cbfc96277fdcbb1.tar.bz2 | |
gh-106238: Handle KeyboardInterrupt during logging._acquireLock() (GH-106239)
Co-authored-by: Ariel Eizenberg <ariel.eizenberg@pagaya.com>
| -rw-r--r-- | Lib/logging/__init__.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2023-06-29-12-40-52.gh-issue-106238.VulKb9.rst | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index ba2ed44..fe2039a 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -238,7 +238,11 @@ def _acquireLock(): This should be released with _releaseLock(). """ if _lock: - _lock.acquire() + try: + _lock.acquire() + except BaseException: + _lock.release() + raise def _releaseLock(): """ diff --git a/Misc/NEWS.d/next/Library/2023-06-29-12-40-52.gh-issue-106238.VulKb9.rst b/Misc/NEWS.d/next/Library/2023-06-29-12-40-52.gh-issue-106238.VulKb9.rst new file mode 100644 index 0000000..52e7838 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-06-29-12-40-52.gh-issue-106238.VulKb9.rst @@ -0,0 +1 @@ +Fix rare concurrency bug in lock acquisition by the logging package. |