MAINT: Check error in Get(Arg)SortFunc using return value

MaanasArora · MaanasArora · commit 39f5ef2877a8 · 2025-05-13T18:04:14.000-04:00
diff --git a/numpy/_core/src/multiarray/item_selection.c b/numpy/_core/src/multiarray/item_selection.c
@@ -1594,9 +1594,7 @@ PyArray_Sort(PyArrayObject *op, int axis, NPY_SORTKIND which)
         return -1;
     }
 
-    PyArray_GetSortFunction(PyArray_DESCR(op), which, 0, &sort, &auxdata);
-
-    if (sort == NULL) {
+    if (PyArray_GetSortFunction(PyArray_DESCR(op), which, 0, &sort, &auxdata) < 0) {
         sort_with_array = PyDataType_GetArrFuncs(PyArray_DESCR(op))->sort[which];
     }
 
@@ -1769,9 +1767,7 @@ PyArray_ArgSort(PyArrayObject *op, int axis, NPY_SORTKIND which)
 
     NpyAuxData *auxdata = NULL;
 
-    PyArray_GetArgSortFunction(PyArray_DESCR(op), which, 0, &argsort, &auxdata);
-
-    if (argsort == NULL) {
+    if (PyArray_GetArgSortFunction(PyArray_DESCR(op), which, 0, &argsort, &auxdata) < 0) {
         argsort_with_array = PyDataType_GetArrFuncs(PyArray_DESCR(op))->argsort[which];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1594,9 +1594,7 @@ PyArray_Sort(PyArrayObject *op, int axis, NPY_SORTKIND which)`
`1594`	`1594`	`return -1;`
`1595`	`1595`	`}`
`1596`	`1596`
`1597`		`- PyArray_GetSortFunction(PyArray_DESCR(op), which, 0, &sort, &auxdata);`
`1598`		`-`
`1599`		`- if (sort == NULL) {`
	`1597`	`+ if (PyArray_GetSortFunction(PyArray_DESCR(op), which, 0, &sort, &auxdata) < 0) {`
`1600`	`1598`	`sort_with_array = PyDataType_GetArrFuncs(PyArray_DESCR(op))->sort[which];`
`1601`	`1599`	`}`
`1602`	`1600`
`@@ -1769,9 +1767,7 @@ PyArray_ArgSort(PyArrayObject *op, int axis, NPY_SORTKIND which)`
`1769`	`1767`
`1770`	`1768`	`NpyAuxData *auxdata = NULL;`
`1771`	`1769`
`1772`		`- PyArray_GetArgSortFunction(PyArray_DESCR(op), which, 0, &argsort, &auxdata);`
`1773`		`-`
`1774`		`- if (argsort == NULL) {`
	`1770`	`+ if (PyArray_GetArgSortFunction(PyArray_DESCR(op), which, 0, &argsort, &auxdata) < 0) {`
`1775`	`1771`	`argsort_with_array = PyDataType_GetArrFuncs(PyArray_DESCR(op))->argsort[which];`
`1776`	`1772`	`}`
`1777`	`1773`