Skip to content
Open
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
12 changes: 12 additions & 0 deletions Lib/test/test_capi/test_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,18 @@ def genf(): yield
gen = genf()
self.assertEqual(_testcapi.gen_get_code(gen), gen.gi_code)

def test_tp_bases_slot(self):
cls = _testcapi.HeapCTypeWithBasesSlot
self.assertEqual(cls.__bases__, (int,))
self.assertEqual(cls.__base__, int)

def test_tp_bases_slot_invalid(self):
self.assertRaisesRegex(
SystemError,
"Py_tp_bases is not a tuple",
_testcapi.create_heapctype_with_invalid_bases_slot
)


@requires_limited_api
class TestHeapTypeRelative(unittest.TestCase):
Expand Down
42 changes: 42 additions & 0 deletions Modules/_testcapi/heaptype.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,25 @@ pytype_getmodulebytoken(PyObject *self, PyObject *args)
return PyType_GetModuleByToken((PyTypeObject *)type, token);
}

static PyType_Slot HeapCTypeWithBasesSlotInvalid_slots[] = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure about the name :)
Technically, it is not invalid right now.

What is invalid is that we fill it with None, not with tuple.

{Py_tp_bases, NULL}, /* filled out with Py_None in runtime */
{0, 0},
};

static PyType_Spec HeapCTypeWithBasesSlotInvalid_spec = {
.name = "_testcapi.HeapCTypeWithBasesSlotInvalid",
.basicsize = sizeof(PyObject),
.flags = Py_TPFLAGS_DEFAULT,
.slots = HeapCTypeWithBasesSlotInvalid_slots
};

static PyObject *
create_heapctype_with_invalid_bases_slot(PyObject *self, PyObject *Py_UNUSED(ignored))
{
HeapCTypeWithBasesSlotInvalid_slots[0].pfunc = Py_None;
return PyType_FromSpec(&HeapCTypeWithBasesSlotInvalid_spec);
}


static PyMethodDef TestMethods[] = {
{"pytype_fromspec_meta", pytype_fromspec_meta, METH_O},
Expand All @@ -562,6 +581,8 @@ static PyMethodDef TestMethods[] = {
{"pytype_getbasebytoken", pytype_getbasebytoken, METH_VARARGS},
{"pytype_getmodulebydef", pytype_getmodulebydef, METH_O},
{"pytype_getmodulebytoken", pytype_getmodulebytoken, METH_VARARGS},
{"create_heapctype_with_invalid_bases_slot",
create_heapctype_with_invalid_bases_slot, METH_NOARGS},
{NULL},
};

Expand Down Expand Up @@ -892,6 +913,18 @@ static PyType_Spec HeapCTypeMetaclassNullNew_spec = {
.slots = empty_type_slots
};

static PyType_Slot HeapCTypeWithBasesSlot_slots[] = {
{Py_tp_bases, NULL}, /* filled out in module init function */
{0, 0},
};

static PyType_Spec HeapCTypeWithBasesSlot_spec = {
.name = "_testcapi.HeapCTypeWithBasesSlot",
.basicsize = sizeof(PyLongObject),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.slots = HeapCTypeWithBasesSlot_slots
};


typedef struct {
PyObject_HEAD
Expand Down Expand Up @@ -1432,6 +1465,15 @@ _PyTestCapi_Init_Heaptype(PyObject *m) {
&PyType_Type, m, &HeapCTypeMetaclassNullNew_spec, (PyObject *) &PyType_Type);
ADD("HeapCTypeMetaclassNullNew", HeapCTypeMetaclassNullNew);

PyObject *bases = PyTuple_Pack(1, &PyLong_Type);
if (bases == NULL) {
return -1;
}
HeapCTypeWithBasesSlot_slots[0].pfunc = bases;
PyObject *HeapCTypeWithBasesSlot = PyType_FromSpec(&HeapCTypeWithBasesSlot_spec);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can return NULL in theory, let's add a check for this.

Py_DECREF(bases);
ADD("HeapCTypeWithBasesSlot", HeapCTypeWithBasesSlot);

ADD("Py_TP_USE_SPEC", PyLong_FromVoidPtr(Py_TP_USE_SPEC));

PyObject *HeapCCollection = PyType_FromMetaclass(
Expand Down
Loading