FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-159739: Hold the codec registry lock while unregistering by jelle-openai · Pull Request #160168 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-159739: Hold the codec registry lock while unregistering #160168

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

Open
jelle-openai wants to merge 1 commit into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
+10 −11
Conversation 0 Commits 1 Checks 54 Files changed 2
Open

gh-159739: Hold the codec registry lock while unregistering #160168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .c  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-10-21-19-55-00.gh-issue-159739.codc01.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash in free-threaded builds when :func:`codecs.unregister` is
called concurrently.
19 changes: 8 additions & 11 deletions Python/codecs.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -64,24 +64,21 @@ PyCodec_Unregister(PyObject *search_function)

PyObject *codec_search_path = interp->codecs.search_path;
assert(PyList_CheckExact(codec_search_path));
FT_MUTEX_LOCK(&interp->codecs.search_path_mutex);
for (Py_ssize_t i = 0; i < PyList_GET_SIZE(codec_search_path); i++) {
FT_MUTEX_LOCK(&interp->codecs.search_path_mutex);
PyObject *item = PyList_GetItemRef(codec_search_path, i);
int ret = 1;
if (item == search_function) {
// We hold a reference to the item, so its destructor can't run
// while we hold search_path_mutex.
ret = PyList_SetSlice(codec_search_path, i, i+1, NULL);
}
FT_MUTEX_UNLOCK(&interp->codecs.search_path_mutex);
Py_DECREF(item);
if (ret != 1) {
if (PyList_GET_ITEM(codec_search_path, i) == search_function) {
// Keep the function alive until after releasing the mutex.
Py_INCREF(search_function);
int ret = PyList_SetSlice(codec_search_path, i, i+1, NULL);
FT_MUTEX_UNLOCK(&interp->codecs.search_path_mutex);
Py_DECREF(search_function);
assert(interp->codecs.search_cache != NULL);
assert(PyDict_CheckExact(interp->codecs.search_cache));
PyDict_Clear(interp->codecs.search_cache);
return ret;
}
}
FT_MUTEX_UNLOCK(&interp->codecs.search_path_mutex);
return 0;
}

Expand Down
Loading
Back | FazBrowse Home | New Git URL