Skip to content

gh-103092: Port some _ctypes data types to heap types #113630

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
neonene wants to merge 20 commits into from
+253 −488
Closed

gh-103092: Port some _ctypes data types to heap types #113630

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8bb0d97
PyCSimpleType_new() -> init()
neonene Jan 1, 2024
45795e4
Make Simple_Type a heap type
neonene Jan 1, 2024
550e467
reconsider Simple_traverse()
neonene Jan 2, 2024
6f005f4
warning
neonene Jan 2, 2024
ae9e2f5
non-fix edit
neonene Jan 2, 2024
68d308b
fixes a critical typo
neonene Jan 2, 2024
282d5d4
base check (for now)
neonene Jan 2, 2024
525de82
cleanup
neonene Jan 2, 2024
d92e896
nit
neonene Jan 2, 2024
b5c2b40
convert PyCData_Type family to heap types
neonene Jan 3, 2024
4a9dfe4
CIFuzz friendly
neonene Jan 3, 2024
a1752d4
minor adjustments
neonene Jan 5, 2024
442194a
drop heap type check
neonene Jan 6, 2024
c80223f
Merge branch 'main' into ctypes_simple
neonene Jan 19, 2024
e817dc2
sync callbacks.c with main
neonene Jan 19, 2024
06f81a0
reduce diff
neonene Jan 21, 2024
5354ffb
revert globals-to-fix.tsv
neonene Jan 21, 2024
724f893
nit
neonene Jan 21, 2024
b9d2452
Merge branch 'main' into ctypes_simple
neonene Jan 22, 2024
ea8bc12
Merge branch 'python:main' into ctypes_simple
neonene Jan 27, 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
minor adjustments
  • Loading branch information
@neonene
neonene committed Jan 5, 2024
commit a1752d4a2cc5f45d09de5c2056e125bf5e5fa7f8
7 changes: 4 additions & 3 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ static PyType_Spec structparam_spec = {

/*
PyCStructType_Type - a meta type/class. Creating a new class using this one as
__metaclass__ will call the constructor StructUnionType_new. It replaces the
tp_dict member with a new instance of StgDict, and initializes the C
__metaclass__ will call the constructor StructUnionType_new/init. It replaces
the tp_dict member with a new instance of StgDict, and initializes the C
accessible fields somehow.
*/

Expand Down Expand Up @@ -2715,8 +2715,9 @@ PyCData_clear(CDataObject *self)
{
Py_CLEAR(self->b_objects);
if ((self->b_needsfree)
&& _CDataObject_HasExternalBuffer(self))
&& _CDataObject_HasExternalBuffer(self)) {
PyMem_Free(self->b_ptr);
}
self->b_ptr = NULL;
Py_CLEAR(self->b_base);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion Modules/_ctypes/ctypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ extern PyTypeObject PyCStructType_Type;
#define ArrayObject_Check(st, v) PyObject_TypeCheck((v), (st)->PyCArray_Type)
#define PointerObject_Check(st, v) PyObject_TypeCheck((v), (st)->PyCPointer_Type)
#define PyCPointerTypeObject_Check(v) PyObject_TypeCheck(v, &PyCPointerType_Type)
#define PyCFuncPtrObject_Check(st,v) PyObject_TypeCheck((v), (st)->PyCFuncPtr_Type)
#define PyCFuncPtrObject_Check(st, v) PyObject_TypeCheck((v), (st)->PyCFuncPtr_Type)
#define PyCFuncPtrTypeObject_Check(v) PyObject_TypeCheck(v, &PyCFuncPtrType_Type)
#define PyCStructTypeObject_Check(v) PyObject_TypeCheck(v, &PyCStructType_Type)

Expand Down