Skip to content

[3.12] gh-116510: Fix a crash due to shared immortal interned strings. #124541

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

Merged
nascheme merged 2 commits into from
Sep 27, 2024
+47 −6
Merged

[3.12] gh-116510: Fix a crash due to shared immortal interned strings. #124541

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa5e2a
gh-116510: Fix crash due to shared immortal interned strings.
nascheme Sep 25, 2024
82cfa96
Small code cleanup as suggested by review.
nascheme Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Small code cleanup as suggested by review.
  • Loading branch information
@nascheme
nascheme committed Sep 27, 2024
commit 82cfa9675a7632a8b940fd9de8d18d904745cfa5
18 changes: 11 additions & 7 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,12 @@ init_interned_dict(PyInterpreterState *interp)
static void
clear_interned_dict(PyInterpreterState *interp)
{
if (has_shared_intern_dict(interp)) {
return; // the dict doesn't belong to this interpreter
}
PyObject *interned = get_interned_dict(interp);
if (interned != NULL) {
PyDict_Clear(interned);
if (!has_shared_intern_dict(interp)) {
// only clear if the dict belongs to this interpreter
PyDict_Clear(interned);
}
Py_DECREF(interned);
_Py_INTERP_CACHED_OBJECT(interp, interned_strings) = NULL;
}
Expand Down Expand Up @@ -14882,15 +14882,19 @@ PyUnicode_InternFromString(const char *cp)
void
_PyUnicode_ClearInterned(PyInterpreterState *interp)
{
if (has_shared_intern_dict(interp)) {
return; // the dict doesn't belong to this interpreter
}
PyObject *interned = get_interned_dict(interp);
if (interned == NULL) {
return;
}
assert(PyDict_CheckExact(interned));

if (has_shared_intern_dict(interp)) {
// the dict doesn't belong to this interpreter, skip the debug
// checks on it and just clear the pointer to it
clear_interned_dict(interp);
return;
}

/* TODO:
* Currently, the runtime is not able to guarantee that it can exit without
* allocations that carry over to a future initialization of Python within
Expand Down