Skip to content

gh-132685: fix thread safety of PyMember_GetOne with _Py_T_OBJECT #132690

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
merged 1 commit into from
Apr 18, 2025
Merged

gh-132685: fix thread safety of PyMember_GetOne with _Py_T_OBJECT #132690

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions Python/structmember.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,22 @@ PyMember_GetOne(const char *obj_addr, PyMemberDef *l)
break;
}
case _Py_T_OBJECT:
v = *(PyObject **)addr;
if (v == NULL)
v = FT_ATOMIC_LOAD_PTR(*(PyObject **) addr);
if (v != NULL) {
#ifdef Py_GIL_DISABLED
if (!_Py_TryIncrefCompare((PyObject **) addr, v)) {
Py_BEGIN_CRITICAL_SECTION((PyObject *) obj_addr);
v = FT_ATOMIC_LOAD_PTR(*(PyObject **) addr);
Py_XINCREF(v);
Py_END_CRITICAL_SECTION();
}
#else
Py_INCREF(v);
#endif
}
if (v == NULL) {
v = Py_None;
Py_INCREF(v);
}
break;
case Py_T_OBJECT_EX:
v = member_get_object(addr, obj_addr, l);
Expand Down
Loading