Skip to content

gh-127295: ctypes: Switch field accessors to fixed-width integers #127297

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 20 commits into from
Dec 20, 2024
+501 −652
Merged

gh-127295: ctypes: Switch field accessors to fixed-width integers #127297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eeb0d4e
Consistently pass the size to getfunc/setfunc
encukou Nov 19, 2024
e33c929
Switch to fixed-width integers
encukou Nov 22, 2024
a11c0d9
Remove comment for obsolete idea
encukou Nov 26, 2024
c69b65f
Fix the size argument
encukou Nov 26, 2024
eb8cf98
Re-run Clinic
encukou Nov 26, 2024
b9ed727
Regen Clinic
encukou Nov 26, 2024
7cbe57c
Specify signedness of the FFI types, don't match the C types
encukou Nov 26, 2024
144a3b0
Avoid compiler warnings
encukou Nov 26, 2024
fcae66b
Silence the GCC warning in a more local way. It's a GCC bug.
encukou Nov 26, 2024
05ba989
Apply suggestions from code review
encukou Dec 6, 2024
7c08d60
Add parens around macro argument
encukou Dec 6, 2024
50c82be
Fix refcounting for _CTYPES_DEBUG_KEEP builds
encukou Dec 6, 2024
7375c09
Consistency in comments. Why not.
encukou Dec 6, 2024
6e8a4de
Merge in the main branch
encukou Dec 6, 2024
870a038
Include <stdbool.h> & use `bool` rather than `_Bool`
encukou Dec 9, 2024
1b41ace
Use a mutex around _ctypes_init_fielddesc
encukou Dec 9, 2024
07d7ded
Merge in the main branch
encukou Dec 13, 2024
34098c3
Nitpick: Use true/false for bool
encukou Dec 13, 2024
5155293
Avoid unaligned load
encukou Dec 18, 2024
821a7b8
Merge branch 'main' into ctypes-fixint
encukou Dec 19, 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
4 changes: 2 additions & 2 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1978,7 +1978,7 @@ c_void_p_from_param_impl(PyObject *type, PyTypeObject *cls, PyObject *value)
return NULL;
parg->pffi_type = &ffi_type_pointer;
parg->tag = 'P';
parg->obj = fd->setfunc(&parg->value, value, 0);
parg->obj = fd->setfunc(&parg->value, value, sizeof(void*));
if (parg->obj == NULL) {
Py_DECREF(parg);
return NULL;
Expand Down Expand Up @@ -2443,7 +2443,7 @@ PyCSimpleType_from_param_impl(PyObject *type, PyTypeObject *cls,

parg->tag = fmt[0];
parg->pffi_type = fd->pffi_type;
parg->obj = fd->setfunc(&parg->value, value, 0);
parg->obj = fd->setfunc(&parg->value, value, info->size);
if (parg->obj)
return (PyObject *)parg;
PyObject *exc = PyErr_GetRaisedException();
Expand Down
2 changes: 1 addition & 1 deletion Modules/_ctypes/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static void _CallPythonObject(ctypes_state *st,
be the result. EXCEPT when restype is py_object - Python
itself knows how to manage the refcount of these objects.
*/
PyObject *keep = setfunc(mem, result, 0);
PyObject *keep = setfunc(mem, result, restype->size);

if (keep == NULL) {
/* Could not convert callback result. */
Expand Down
Loading
Loading