Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Avoid a crash when a :class:`threading.local` subclass finalizer accesses
attributes after construction fails.
25 changes: 15 additions & 10 deletions Modules/_threadmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1542,10 +1542,25 @@ local_new(PyTypeObject *type, PyObject *args, PyObject *kw)
assert(module != NULL);
thread_module_state *state = get_thread_state(module);

// A subclass finalizer may access attributes if construction fails.
PyObject *localdicts = PyDict_New();
if (localdicts == NULL) {
return NULL;
}
PyObject *thread_watchdogs = PySet_New(NULL);
if (thread_watchdogs == NULL) {
Py_DECREF(localdicts);
return NULL;
}

localobject *self = (localobject *)type->tp_alloc(type, 0);
if (self == NULL) {
Py_DECREF(localdicts);
Py_DECREF(thread_watchdogs);
return NULL;
}
self->localdicts = localdicts;
self->thread_watchdogs = thread_watchdogs;

// gh-128691: Use deferred reference counting for thread-locals to avoid
// contention on the shared object.
Expand All @@ -1554,16 +1569,6 @@ local_new(PyTypeObject *type, PyObject *args, PyObject *kw)
self->args = Py_XNewRef(args);
self->kw = Py_XNewRef(kw);

self->localdicts = PyDict_New();
if (self->localdicts == NULL) {
goto err;
}

self->thread_watchdogs = PySet_New(NULL);
if (self->thread_watchdogs == NULL) {
goto err;
}

PyObject *localsdict = NULL;
PyObject *sentinel_wr = NULL;
if (create_localsdict(self, state, &localsdict, &sentinel_wr) < 0) {
Expand Down
Loading