diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-06-19 13:37:42 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-06-19 13:37:42 -0700 |
| commit | 006544acdfd8d87cfa2ad737481c8e1de3ab6586 (patch) | |
| tree | 6f3b403d2c136f75936e1fa5246659b8ed738311 | |
| parent | 074a40c9f597b2a8ae66f5c18f027269e0dfb4d0 (diff) | |
| parent | 1b6926f2b4922fa0589715d94f7f592444969bec (diff) | |
| download | numpy-006544acdfd8d87cfa2ad737481c8e1de3ab6586.tar.gz | |
Merge pull request #3456 from juliantaylor/uninitialized-use
BUG: fix uninitialized-use on invalid sort kind
| -rw-r--r-- | numpy/core/src/multiarray/item_selection.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c index 373e17425..9be9f7140 100644 --- a/numpy/core/src/multiarray/item_selection.c +++ b/numpy/core/src/multiarray/item_selection.c @@ -1045,6 +1045,8 @@ PyArray_Sort(PyArrayObject *op, int axis, NPY_SORTKIND which) return -1; } + SWAPAXES2(op); + switch (which) { case NPY_QUICKSORT : sort = npy_quicksort; @@ -1061,9 +1063,6 @@ PyArray_Sort(PyArrayObject *op, int axis, NPY_SORTKIND which) goto fail; } - - SWAPAXES2(op); - ap = (PyArrayObject *)PyArray_FromAny((PyObject *)op, NULL, 1, 0, NPY_ARRAY_DEFAULT | NPY_ARRAY_UPDATEIFCOPY, NULL); |