greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-133467: Fix typeobject tp_base race in free threading (gh-140549)

Browse Source
This commit is contained in:
Edward Xu
2025-11-06 05:20:40 +08:00
committed by GitHub
parent 986bb0a1a2
commit b83f379a97
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Objects/typeobject.c
View File

@@ -189,6 +189,8 @@ type_lock_allow_release(void)
#define types_world_is_stopped() 1
#define types_stop_world()
#define types_start_world()
#define type_lock_prevent_release()
#define type_lock_allow_release()
#endif
@@ -1920,8 +1922,12 @@ type_set_bases_unlocked(PyTypeObject *type, PyObject *new_bases, PyTypeObject *b
assert(old_bases != NULL);
PyTypeObject *old_base = type->tp_base;
type_lock_prevent_release();
types_stop_world();
set_tp_bases(type, Py_NewRef(new_bases), 0);
type->tp_base = (PyTypeObject *)Py_NewRef(best_base);
types_start_world();
type_lock_allow_release();
PyObject *temp = PyList_New(0);
if (temp == NULL) {
@@ -1982,8 +1988,12 @@ type_set_bases_unlocked(PyTypeObject *type, PyObject *new_bases, PyTypeObject *b
if (lookup_tp_bases(type) == new_bases) {
assert(type->tp_base == best_base);
type_lock_prevent_release();
types_stop_world();
set_tp_bases(type, old_bases, 0);
type->tp_base = old_base;
types_start_world();
type_lock_allow_release();
Py_DECREF(new_bases);
Py_DECREF(best_base);