BUG: Fixed partition errors on empty input. Closes numpy#6530

yashmehrotra · charris · commit 120da4f7ac16 · 2015-10-27T14:45:50.000-06:00
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
@@ -809,7 +809,7 @@ _new_sortlike(PyArrayObject *op, int axis, PyArray_SortFunc *sort,
     PyArrayIterObject *it;
     npy_intp size;
 
-    int ret = -1;
+    int ret = 0;
 
     NPY_BEGIN_THREADS_DEF;
 
@@ -829,6 +829,7 @@ _new_sortlike(PyArrayObject *op, int axis, PyArray_SortFunc *sort,
     if (needcopy) {
         buffer = PyDataMem_NEW(N * elsize);
         if (buffer == NULL) {
+            ret = -1;
             goto fail;
         }
     }
@@ -947,7 +948,7 @@ _new_argsortlike(PyArrayObject *op, int axis, PyArray_ArgSortFunc *argsort,
     PyArrayIterObject *it, *rit;
     npy_intp size;
 
-    int ret = -1;
+    int ret = 0;
 
     NPY_BEGIN_THREADS_DEF;
 
@@ -969,6 +970,7 @@ _new_argsortlike(PyArrayObject *op, int axis, PyArray_ArgSortFunc *argsort,
     it = (PyArrayIterObject *)PyArray_IterAllButAxis((PyObject *)op, &axis);
     rit = (PyArrayIterObject *)PyArray_IterAllButAxis((PyObject *)rop, &axis);
     if (it == NULL || rit == NULL) {
+        ret = -1;
         goto fail;
     }
     size = it->size;
@@ -978,13 +980,15 @@ _new_argsortlike(PyArrayObject *op, int axis, PyArray_ArgSortFunc *argsort,
     if (needcopy) {
         valbuffer = PyDataMem_NEW(N * elsize);
         if (valbuffer == NULL) {
+            ret = -1;
             goto fail;
         }
     }
 
     if (needidxbuffer) {
         idxbuffer = (npy_intp *)PyDataMem_NEW(N * sizeof(npy_intp));
         if (idxbuffer == NULL) {
+            ret = -1;
             goto fail;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ _new_sortlike(PyArrayObject op, int axis, PyArray_SortFunc sort,`
`809`	`809`	`PyArrayIterObject *it;`
`810`	`810`	`npy_intp size;`
`811`	`811`
`812`		`- int ret = -1;`
	`812`	`+ int ret = 0;`
`813`	`813`
`814`	`814`	`NPY_BEGIN_THREADS_DEF;`
`815`	`815`
`@@ -829,6 +829,7 @@ _new_sortlike(PyArrayObject op, int axis, PyArray_SortFunc sort,`
`829`	`829`	`if (needcopy) {`
`830`	`830`	`buffer = PyDataMem_NEW(N * elsize);`
`831`	`831`	`if (buffer == NULL) {`
	`832`	`+ ret = -1;`
`832`	`833`	`goto fail;`
`833`	`834`	`}`
`834`	`835`	`}`
`@@ -947,7 +948,7 @@ _new_argsortlike(PyArrayObject op, int axis, PyArray_ArgSortFunc argsort,`
`947`	`948`	`PyArrayIterObject it, rit;`
`948`	`949`	`npy_intp size;`
`949`	`950`
`950`		`- int ret = -1;`
	`951`	`+ int ret = 0;`
`951`	`952`
`952`	`953`	`NPY_BEGIN_THREADS_DEF;`
`953`	`954`
`@@ -969,6 +970,7 @@ _new_argsortlike(PyArrayObject op, int axis, PyArray_ArgSortFunc argsort,`
`969`	`970`	`it = (PyArrayIterObject )PyArray_IterAllButAxis((PyObject )op, &axis);`
`970`	`971`	`rit = (PyArrayIterObject )PyArray_IterAllButAxis((PyObject )rop, &axis);`
`971`	`972`	`if (it == NULL \|\| rit == NULL) {`
	`973`	`+ ret = -1;`
`972`	`974`	`goto fail;`
`973`	`975`	`}`
`974`	`976`	`size = it->size;`
`@@ -978,13 +980,15 @@ _new_argsortlike(PyArrayObject op, int axis, PyArray_ArgSortFunc argsort,`
`978`	`980`	`if (needcopy) {`
`979`	`981`	`valbuffer = PyDataMem_NEW(N * elsize);`
`980`	`982`	`if (valbuffer == NULL) {`
	`983`	`+ ret = -1;`
`981`	`984`	`goto fail;`
`982`	`985`	`}`
`983`	`986`	`}`
`984`	`987`
`985`	`988`	`if (needidxbuffer) {`
`986`	`989`	`idxbuffer = (npy_intp )PyDataMem_NEW(N sizeof(npy_intp));`
`987`	`990`	`if (idxbuffer == NULL) {`
	`991`	`+ ret = -1;`
`988`	`992`	`goto fail;`
`989`	`993`	`}`
`990`	`994`	`}`