Skip to content

Fix refcounting for tp_base objects of new types #950

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 6 commits into from
Jul 20, 2017
Merged

Fix refcounting for tp_base objects of new types #950

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cdec60d
Fix refcounting for tp_base objects of new types
Jun 15, 2017
19d39c0
type_with_ref_incd(): Use direct Py_INCREF
bennorth Jul 19, 2017
ffbe227
type_with_ref_incd(): 'inline' not 'static'
bennorth Jul 19, 2017
280abf4
type_with_ref_incd(): Move outside PYPY ifdef
bennorth Jul 19, 2017
3cd5f92
type_incref(): Rename from 'type_with_ref_incd'
bennorth Jul 20, 2017
c5e0a94
make_new_python_type(): type_incref() for tp_base
bennorth Jul 20, 2017
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
13 changes: 9 additions & 4 deletions include/pybind11/class_support.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
NAMESPACE_BEGIN(pybind11)
NAMESPACE_BEGIN(detail)

inline PyTypeObject *type_incref(PyTypeObject *type) {
Py_INCREF(type);
return type;
}

#if !defined(PYPY_VERSION)

/// `pybind11_static_property.__get__()`: Always pass the class instead of the instance.
Expand Down Expand Up @@ -49,7 +54,7 @@ inline PyTypeObject *make_static_property_type() {

auto type = &heap_type->ht_type;
type->tp_name = name;
type->tp_base = &PyProperty_Type;
type->tp_base = type_incref(&PyProperty_Type);
type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
type->tp_descr_get = pybind11_static_get;
type->tp_descr_set = pybind11_static_set;
Expand Down Expand Up @@ -162,7 +167,7 @@ inline PyTypeObject* make_default_metaclass() {

auto type = &heap_type->ht_type;
type->tp_name = name;
type->tp_base = &PyType_Type;
type->tp_base = type_incref(&PyType_Type);
type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;

type->tp_setattro = pybind11_meta_setattro;
Expand Down Expand Up @@ -361,7 +366,7 @@ inline PyObject *make_object_base_type(PyTypeObject *metaclass) {

auto type = &heap_type->ht_type;
type->tp_name = name;
type->tp_base = &PyBaseObject_Type;
type->tp_base = type_incref(&PyBaseObject_Type);
type->tp_basicsize = static_cast<ssize_t>(sizeof(instance));
type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;

Expand Down Expand Up @@ -552,7 +557,7 @@ inline PyObject* make_new_python_type(const type_record &rec) {
auto type = &heap_type->ht_type;
type->tp_name = strdup(full_name.c_str());
type->tp_doc = tp_doc;
type->tp_base = (PyTypeObject *) handle(base).inc_ref().ptr();
type->tp_base = type_incref((PyTypeObject *)base);
type->tp_basicsize = static_cast<ssize_t>(sizeof(instance));
if (bases.size() > 0)
type->tp_bases = bases.release().ptr();
Expand Down