@@ -1013,10 +1013,26 @@ _copy_and_return_void_setitem(_PyArray_LegacyDescr *dstdescr, char *dstdata,
10131013 if (_setup_field (i , dstdescr , dummy_arr , & offset , dstdata )) {
10141014 return -1 ;
10151015 }
1016- PyDataType_GetArrFuncs (PyArray_DESCR (dummy_arr ))-> copyswap (dstdata + offset ,
1017- srcdata + offset , 0 , dummy_arr );
1016+ PyArray_CopySwapFunc * copyswap =
1017+ PyDataType_GetArrFuncs (PyArray_DESCR (dummy_arr ))-> copyswap ;
1018+ if (copyswap == NULL ) {
1019+ /* a field dtype without the legacy copyswap slot; the
1020+ casting path below handles it correctly */
1021+ break ;
1022+ }
1023+ copyswap (dstdata + offset , srcdata + offset , 0 , dummy_arr );
1024+ if (PyErr_Occurred ()) {
1025+ /*
1026+ * Clear the error and use the casting path, which
1027+ * handles it and overwrites any partially copied fields.
1028+ */
1029+ PyErr_Clear ();
1030+ break ;
1031+ }
1032+ }
1033+ if (i == names_size ) {
1034+ return 0 ;
10181035 }
1019- return 0 ;
10201036 }
10211037
10221038 /* Slow path */
@@ -2259,6 +2275,17 @@ STRING_copyswapn (char *dst, npy_intp dstride, char *src, npy_intp sstride,
22592275}
22602276
22612277
2278+ /* See common.h for the contract of this helper. */
2279+ NPY_NO_EXPORT int
2280+ raise_missing_copyswap (PyArray_Descr * dtype , int inplace_swap )
2281+ {
2282+ (void )inplace_swap ;
2283+ npy_gil_error (PyExc_TypeError ,
2284+ "dtype %S does not implement copyswap" ,
2285+ (PyObject * )dtype );
2286+ return -1 ;
2287+ }
2288+
22622289/* */
22632290static void
22642291VOID_copyswapn (char * dst , npy_intp dstride , char * src , npy_intp sstride ,
@@ -2289,9 +2316,14 @@ VOID_copyswapn (char *dst, npy_intp dstride, char *src, npy_intp sstride,
22892316 }
22902317
22912318 dummy_fields .descr = new ;
2292- PyDataType_GetArrFuncs (new )-> copyswapn (dst + offset , dstride ,
2293- (src != NULL ? src + offset : NULL ),
2294- sstride , n , swap , dummy_arr );
2319+ PyArray_CopySwapNFunc * copyswapn =
2320+ PyDataType_GetArrFuncs (new )-> copyswapn ;
2321+ if (copyswapn == NULL && raise_missing_copyswap (new , src == NULL ) < 0 ) {
2322+ return ;
2323+ }
2324+ copyswapn (dst + offset , dstride ,
2325+ (src != NULL ? src + offset : NULL ),
2326+ sstride , n , swap , dummy_arr );
22952327 }
22962328 return ;
22972329 }
@@ -2330,10 +2362,15 @@ VOID_copyswapn (char *dst, npy_intp dstride, char *src, npy_intp sstride,
23302362 PyArrayObject * dummy_arr = (PyArrayObject * )& dummy_fields ;
23312363 ((PyArrayObject_fields * )dummy_arr )-> descr = new ;
23322364
2365+ PyArray_CopySwapNFunc * copyswapn =
2366+ PyDataType_GetArrFuncs (new )-> copyswapn ;
2367+ if (copyswapn == NULL && raise_missing_copyswap (new , src == NULL ) < 0 ) {
2368+ return ;
2369+ }
23332370 num = descr -> elsize / subitemsize ;
23342371 for (i = 0 ; i < n ; i ++ ) {
2335- PyDataType_GetArrFuncs ( new ) -> copyswapn (dstptr , subitemsize , srcptr ,
2336- subitemsize , num , swap , dummy_arr );
2372+ copyswapn (dstptr , subitemsize , srcptr ,
2373+ subitemsize , num , swap , dummy_arr );
23372374 dstptr += dstride ;
23382375 if (srcptr ) {
23392376 srcptr += sstride ;
@@ -2374,9 +2411,14 @@ VOID_copyswap (char *dst, char *src, int swap, PyArrayObject *arr)
23742411 return ;
23752412 }
23762413 dummy_fields .descr = new ;
2377- PyDataType_GetArrFuncs (new )-> copyswap (dst + offset ,
2378- (src != NULL ? src + offset : NULL ),
2379- swap , dummy_arr );
2414+ PyArray_CopySwapFunc * copyswap =
2415+ PyDataType_GetArrFuncs (new )-> copyswap ;
2416+ if (copyswap == NULL && raise_missing_copyswap (new , src == NULL ) < 0 ) {
2417+ return ;
2418+ }
2419+ copyswap (dst + offset ,
2420+ (src != NULL ? src + offset : NULL ),
2421+ swap , dummy_arr );
23802422 }
23812423 return ;
23822424 }
@@ -2411,9 +2453,14 @@ VOID_copyswap (char *dst, char *src, int swap, PyArrayObject *arr)
24112453 PyArrayObject * dummy_arr = (PyArrayObject * )& dummy_fields ;
24122454 dummy_fields .descr = new ;
24132455
2456+ PyArray_CopySwapNFunc * copyswapn =
2457+ PyDataType_GetArrFuncs (new )-> copyswapn ;
2458+ if (copyswapn == NULL && raise_missing_copyswap (new , src == NULL ) < 0 ) {
2459+ return ;
2460+ }
24142461 num = descr -> elsize / subitemsize ;
2415- PyDataType_GetArrFuncs ( new ) -> copyswapn (dst , subitemsize , src ,
2416- subitemsize , num , swap , dummy_arr );
2462+ copyswapn (dst , subitemsize , src ,
2463+ subitemsize , num , swap , dummy_arr );
24172464 return ;
24182465 }
24192466 /* Must be a naive Void type (e.g. a "V8") so simple copy is sufficient. */
@@ -3049,6 +3096,13 @@ VOID_compare(char *ip1, char *ip2, PyArrayObject *ap)
30493096 /* Set the fields needed by compare or copyswap */
30503097 dummy_struct .descr = new ;
30513098
3099+ if (PyDataType_GetArrFuncs (new )-> compare == NULL ) {
3100+ npy_gil_error (PyExc_TypeError ,
3101+ "dtype %S does not support comparison" ,
3102+ (PyObject * )new );
3103+ /* res is 0, so the caller sees equality alongside the error */
3104+ goto finish ;
3105+ }
30523106 swap = PyArray_ISBYTESWAPPED (dummy );
30533107 nip1 = ip1 + offset ;
30543108 nip2 = ip2 + offset ;
0 commit comments