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
52 changes: 52 additions & 0 deletions Lib/test/test_ctypes/test_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,58 @@ def test_parameter_repr(self):
self.assertRegex(repr(c_wchar_p.from_param('hihi')), r"^<cparam 'Z' \(0x[A-Fa-f0-9]+\)>$")
self.assertRegex(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' \(0x0*12\)>$")

@test.support.cpython_only
def test_from_param_result_refcount(self):
# Issue #99952
import _ctypes_test
from ctypes import PyDLL, c_int, c_void_p, py_object, Structure

class X(Structure):
"""This struct size is <= sizeof(void*)."""
_fields_ = [("a", c_void_p)]

def __del__(self):
trace.append(4)

@classmethod
def from_param(cls, value):
trace.append(2)
return cls()

PyList_Append = PyDLL(_ctypes_test.__file__)._testfunc_pylist_append
PyList_Append.restype = c_int
PyList_Append.argtypes = [py_object, py_object, X]

trace = []
trace.append(1)
PyList_Append(trace, 3, "dummy")
trace.append(5)

self.assertEqual(trace, [1, 2, 3, 4, 5])

class Y(Structure):
"""This struct size is > sizeof(void*)."""
_fields_ = [("a", c_void_p), ("b", c_void_p)]

def __del__(self):
trace.append(4)

@classmethod
def from_param(cls, value):
trace.append(2)
return cls()

PyList_Append = PyDLL(_ctypes_test.__file__)._testfunc_pylist_append
PyList_Append.restype = c_int
PyList_Append.argtypes = [py_object, py_object, Y]

trace = []
trace.append(1)
PyList_Append(trace, 3, "dummy")
trace.append(5)

self.assertEqual(trace, [1, 2, 3, 4, 5])

################################################################

if __name__ == '__main__':
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a reference undercounting issue in :class:`ctypes.Structure` with ``from_param()``
results larger than a C pointer.
3 changes: 3 additions & 0 deletions Modules/_ctypes/_ctypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,13 +412,15 @@ _ctypes_alloc_format_string_with_shape(int ndim, const Py_ssize_t *shape,
typedef struct {
PyObject_HEAD
void *ptr;
PyObject *keep; // If set, a reference to the original CDataObject.
} StructParamObject;


static void
StructParam_dealloc(PyObject *myself)
{
StructParamObject *self = (StructParamObject *)myself;
Py_XDECREF(self->keep);
PyMem_Free(self->ptr);
Py_TYPE(self)->tp_free(myself);
}
Expand Down Expand Up @@ -466,6 +468,7 @@ StructUnionType_paramfunc(CDataObject *self)

StructParamObject *struct_param = (StructParamObject *)obj;
struct_param->ptr = ptr;
struct_param->keep = Py_NewRef(self);
} else {
ptr = self->b_ptr;
obj = Py_NewRef(self);
Expand Down
6 changes: 6 additions & 0 deletions Modules/_ctypes/_ctypes_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,12 @@ EXPORT(long) _test_i38748_runCallback(_test_i38748_funcType callback, int a, int

#endif

EXPORT(int)
_testfunc_pylist_append(PyObject *list, PyObject *item)
{
return PyList_Append(list, item);
}

static struct PyModuleDef_Slot _ctypes_test_slots[] = {
{0, NULL}
};
Expand Down