diff options
| author | mattip <matti.picus@gmail.com> | 2019-01-20 21:02:46 +0200 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2019-01-20 21:02:46 +0200 |
| commit | 8cecce5514b9e290bd65a3c51463e03b7702760a (patch) | |
| tree | 6c9d9e5aac0839336698ad1f2a9972ac8bc963de | |
| parent | f07a38da97a6a36eb12b203f6c1ffa4bf2b2cb87 (diff) | |
| download | numpy-8cecce5514b9e290bd65a3c51463e03b7702760a.tar.gz | |
BUG: resolve writeback in arr_insert failure paths
| -rw-r--r-- | numpy/core/src/multiarray/compiled_base.c | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_multiarray.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarray/compiled_base.c index 10e3478e2..b23e55bfd 100644 --- a/numpy/core/src/multiarray/compiled_base.c +++ b/numpy/core/src/multiarray/compiled_base.c @@ -328,6 +328,7 @@ arr_insert(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict) } else { Py_XDECREF(values); Py_XDECREF(mask); + PyArray_ResolveWritebackIfCopy(array); Py_XDECREF(array); Py_RETURN_NONE; } @@ -358,6 +359,7 @@ arr_insert(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict) fail: Py_XDECREF(mask); + PyArray_ResolveWritebackIfCopy(array); Py_XDECREF(array); Py_XDECREF(values); return NULL; diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py index cdacdabbe..a7517aa54 100644 --- a/numpy/core/tests/test_multiarray.py +++ b/numpy/core/tests/test_multiarray.py @@ -7653,6 +7653,8 @@ class TestWritebackIfCopy(object): # uses arr_insert np.place(a, a>2, [44, 55]) assert_equal(a, np.array([[0, 44], [1, 55], [2, 44]])) + # hit one of the failing paths + assert_raises(ValueError, np.place, a, a>20, []) def test_put_noncontiguous(self): a = np.arange(6).reshape(2,3).T # force non-c-contiguous |