Skip to content

gh-148573: correct allocation of complex types in the ctypes #148579

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
skirpichev wants to merge 4 commits into from
Closed

gh-148573: correct allocation of complex types in the ctypes #148579

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c3c489
gh-148573: correct allocation of complex types in the ctypes
skirpichev Apr 14, 2026
dbea9c2
Update Modules/_ctypes/_ctypes.c
skirpichev Apr 15, 2026
1b4e4d9
Merge branch 'master' into fix-148573
skirpichev Apr 15, 2026
b6ebcfc
add comment
skirpichev Apr 15, 2026
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
3 changes: 2 additions & 1 deletion Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2367,7 +2367,8 @@ PyCSimpleType_init(PyObject *self, PyObject *args, PyObject *kwds)
stginfo->ffi_type_pointer = *fmt->pffi_type;
}
else {
const size_t els_size = sizeof(fmt->pffi_type->elements);
assert(fmt->pffi_type->type == FFI_TYPE_COMPLEX);
Comment on lines +2370 to +2372
Copy link
Copy Markdown
Member

@encukou encukou Apr 16, 2026

Choose a reason for hiding this comment

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

Thanks! There's one more check we can do here.

Suggested change
/* From primitive types - only complex types have the elements
struct field as non-NULL (two element array). */
assert(fmt->pffi_type->type == FFI_TYPE_COMPLEX);
/* From primitive types - only complex types have the elements struct
field as non-NULL (two element array, including final NULL). */
assert(fmt->pffi_type->type == FFI_TYPE_COMPLEX);
assert(fmt->pffi_type->elements[1] == NULL);

Copy link
Copy Markdown
Member

@sunmy2019 sunmy2019 Apr 16, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

If that's needed, how about using the same check in libffi, i.e.

a->elements != NULL && a->elements[0] != NULL && a->elements[1] == NULL

Copy link
Copy Markdown
Member Author

@skirpichev skirpichev Apr 16, 2026

Choose a reason for hiding this comment

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

I don't think we need this. Actual FFI-invariants are irrelevant for us. The only assumption from our side is that the possible type here is FFI_TYPE_COMPLEX.

Copy link
Copy Markdown
Member

@sunmy2019 sunmy2019 Apr 17, 2026

Choose a reason for hiding this comment

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

I agree it is okay without additional checks, since the behavior here is well documented.
https://github.com/libffi/libffi/blob/10056e7e6a0d40d2a21af63484b99f08898dde9e/doc/libffi.texi#L694

const size_t els_size = 2 * sizeof(ffi_type *);
stginfo->ffi_type_pointer.size = fmt->pffi_type->size;
stginfo->ffi_type_pointer.alignment = fmt->pffi_type->alignment;
stginfo->ffi_type_pointer.type = fmt->pffi_type->type;
Expand Down
Loading