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 @@
Fixes possible crash on :class:`types.CodeType` deallocation.
20 changes: 13 additions & 7 deletions Objects/codeobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,10 @@ _PyCode_New(struct _PyCodeConstructor *con)
return NULL;
}

#ifdef Py_GIL_DISABLED
co->_co_unique_id = _Py_INVALID_UNIQUE_ID;
#endif

if (init_code(co, con) < 0) {
Py_DECREF(co);
return NULL;
Expand Down Expand Up @@ -2449,15 +2453,17 @@ code_dealloc(PyObject *self)
FT_CLEAR_WEAKREFS(self, co->co_weakreflist);
free_monitoring_data(co->_co_monitoring);
#ifdef Py_GIL_DISABLED
// The first element always points to the mutable bytecode at the end of
// the code object, which will be freed when the code object is freed.
for (Py_ssize_t i = 1; i < co->co_tlbc->size; i++) {
char *entry = co->co_tlbc->entries[i];
if (entry != NULL) {
PyMem_Free(entry);
if (co->co_tlbc != NULL) {
// The first element always points to the mutable bytecode at the end of
// the code object, which will be freed when the code object is freed.
for (Py_ssize_t i = 1; i < co->co_tlbc->size; i++) {
char *entry = co->co_tlbc->entries[i];
if (entry != NULL) {
PyMem_Free(entry);
}
}
PyMem_Free(co->co_tlbc);
}
PyMem_Free(co->co_tlbc);
#endif
PyObject_Free(co);
}
Expand Down
Loading