gh-148464: Add missing __ctype_le/be__ attributes for complex types in the ctype module#148485
gh-148464: Add missing __ctype_le/be__ attributes for complex types in the ctype module#148485skirpichev wants to merge 10 commits intopython:mainfrom
__ctype_le/be__ attributes for complex types in the ctype module#148485Conversation
…ex types in the ctype module
skirpichev
force-pushed
the
add-F/D_sw/148464
branch
from
226aaab to
1e45180
Compare
| D_get_sw(void *ptr, Py_ssize_t size) | ||
| { | ||
| assert(NUM_BITS(size) || (size == 2*sizeof(double))); | ||
| return PyComplex_FromDoubles(PyFloat_Unpack8(ptr, PY_BIG_ENDIAN), |
There was a problem hiding this comment.
Could you add error handling for the unpacks here and PyFloat_Unpack4 below?
if (x == -1.0 && PyErr_Occurred()) {
I'd be happier if ctypes didn't rely on an undocumented implementation detail here.
There was a problem hiding this comment.
Why undocumented? It's documented and widely used across the CPython codebase, e.g. in same file.
Old code relying on implementation detail, that elements[1] for the FFI_TYPE_COMPLEX was never read. But this type actually shares same assumption as the FFI_TYPE_STRUCT: the elements field is a NULL-terminated array of pointers to ffi_type objects. So far for primitive types - only complex types have this struct field as non-NULL (two element array).
|
BTW, the |
Co-authored-by: sunmy2019 <59365878+sunmy2019@users.noreply.github.com>
| memcpy(stginfo->ffi_type_pointer.elements, | ||
| fmt->pffi_type->elements, els_size); | ||
| if (set_stginfo_ffi_type_pointer(stginfo, fmt)) { | ||
| PyErr_NoMemory(); |
There was a problem hiding this comment.
| PyErr_NoMemory(); |
Co-authored-by: sunmy2019 <59365878+sunmy2019@users.noreply.github.com>
Co-authored-by: sunmy2019 <59365878+sunmy2019@users.noreply.github.com>
| } | ||
| else { | ||
| assert(fmt->pffi_type->type == FFI_TYPE_COMPLEX); | ||
| const size_t els_size = 2 * sizeof(ffi_type *); |
There was a problem hiding this comment.
elements is NULL-terminated in libffi. For FFI_TYPE_COMPLEX it's {real, imag, NULL} — should be 3 * sizeof(ffi_type *) to include the terminator.
| const size_t els_size = 2 * sizeof(ffi_type *); | |
| const size_t els_size = 3 * sizeof(ffi_type *); |
There was a problem hiding this comment.
For FFI_TYPE_COMPLEX it's {real, imag, NULL} — should be 3 * sizeof(ffi_type *) to include the terminator.
No.
Check:
https://github.com/libffi/libffi/blob/10056e7e6a0d40d2a21af63484b99f08898dde9e/src/types.c#L70-L84
5 participants
__ctype_{be,le}__attributes missing forctypes.c_*_complextypes #148464