Commit237b7f0

committed

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

1 parent40f2d4c commit237b7f0Copy full SHA for 237b7f0

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 6 deletions

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`

Comments

(0)