8000 gh-117142: ctypes: Fix memory leak of StgInfo by neonene · Pull Request #118139 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-117142: ctypes: Fix memory leak of StgInfo #118139

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

Closed
wants to merge 14 commits into from
Closed

gh-117142: ctypes: Fix memory leak of StgInfo #118139

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
773891f
introduce Py_id_static_spec type slot
neonene Apr 21, 2024
17b28bb
introduce _PyType_GetBaseBySpec()
neonene Apr 21, 2024
4d319e4
fix _ctypes mem leak during a finish
neonene Apr 21, 2024
de5b42f
fix redundant base check
neonene Apr 22, 2024
3169285
fix a warning
neonene Apr 22, 2024
9f7f309
fix failing test
neonene Apr 22, 2024
42a8aa7
fix typeslots.py
neonene Apr 22, 2024
9490389
Merge branch 'main' into basespec
neonene Apr 22, 2024
554a8a1
add a comment
neonene Apr 22, 2024
ea1d78c
use MRO if exists
neonene Apr 22, 2024
d47b584
walk MRO from top to down
neonene Apr 23, 2024
9b6bb44
remove get_module_state_by_def_final()
neonene Apr 25, 2024
9b358fa
Merge branch 'main' into basespec
neonene Apr 25, 2024
0ad4fbd
Merge branch 'main' into basespec
neonene May 8, 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
Next Next commit
use MRO if exists
  • Loading branch information
@neonene
neonene committed Apr 22, 2024
commit ea1d78c5e69e0028354e234b71e084982fee8196
27 changes: 23 additions & 4 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4883,7 +4883,7 @@ PyType_GetModuleByDef(PyTypeObject *type, PyModuleDef *def)
}

static PyTypeObject *
get_base_by_spec(PyTypeObject *type, PyType_Spec *spec)
get_base_by_spec_recursive(PyTypeObject *type, PyType_Spec *spec)
{
PyObject *bases = type->tp_bases;
Py_ssize_t n = PyTuple_GET_SIZE(bases);
Expand All @@ -4895,7 +4895,7 @@ get_base_by_spec(PyTypeObject *type, PyType_Spec *spec)
if (((PyHeapTypeObject*)base)->ht_static_spec == spec) {
return base;
}
base = get_base_by_spec(base, spec);
base = get_base_by_spec_recursive(base, spec);
if (base) {
return base;
}
Expand All @@ -4908,10 +4908,29 @@ _PyType_GetBaseBySpec(PyTypeObject *type, PyType_Spec *spec)
{
assert(spec);
assert(PyType_Check(type));
PyTypeObject *res;
PyTypeObject *res = NULL;

BEGIN_TYPE_LOCK()
res = get_base_by_spec(type, spec);
PyObject *mro = lookup_tp_mro(type);
if (mro == NULL) {
res = get_base_by_spec_recursive(typ 6CFD e, spec);
}
else {
// See PyType_GetModuleByDef() implementation
assert(PyTuple_Check(mro));
assert(PyTuple_GET_SIZE(mro) >= 1);
Py_ssize_t n = PyTuple_GET_SIZE(mro);
for (Py_ssize_t i = 0; i < n; i++) {
PyObject *super = PyTuple_GET_ITEM(mro, i);
if(!_PyType_HasFeature((PyTypeObject *)super, Py_TPFLAGS_HEAPTYPE)) {
continue;
}
if (((PyHeapTypeObject*)super)->ht_static_spec == spec) {
res = _PyType_CAST(super);
break;
}
}
}
END_TYPE_LOCK()

if (res == NULL) {
Expand Down
0