diff options
| author | Mark Wiebe <mwiebe@enthought.com> | 2011-07-19 12:15:38 -0500 |
|---|---|---|
| committer | Mark Wiebe <mwiebe@enthought.com> | 2011-07-19 14:00:29 -0500 |
| commit | 57aa9147d46c638cb2acb47b82dfbb60aa903576 (patch) | |
| tree | fbc36ca27fa8fbabaf8237c0d028e1aadc485d8c | |
| parent | 405fc9e502336921a631c020cbcc5a7acedd39cd (diff) | |
| download | numpy-57aa9147d46c638cb2acb47b82dfbb60aa903576.tar.gz | |
BUG: core: Needed to initialize 'obj' to NULL for Py_XDECREF_ERR in fail section
| -rw-r--r-- | numpy/core/include/numpy/ndarrayobject.h | 12 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/item_selection.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/numpy/core/include/numpy/ndarrayobject.h b/numpy/core/include/numpy/ndarrayobject.h index cfc88d743..03dfcd9cd 100644 --- a/numpy/core/include/numpy/ndarrayobject.h +++ b/numpy/core/include/numpy/ndarrayobject.h @@ -161,15 +161,15 @@ extern "C" CONFUSE_EMACS (l)*PyArray_STRIDES(obj)[3])) static NPY_INLINE void -PyArray_XDECREF_ERR(PyArrayObject *obj) +PyArray_XDECREF_ERR(PyArrayObject *arr) { - if (obj) { - if (PyArray_FLAGS(obj) & NPY_ARRAY_UPDATEIFCOPY) { - PyArrayObject *base = (PyArrayObject *)PyArray_BASE(obj); + if (arr != NULL) { + if (PyArray_FLAGS(arr) & NPY_ARRAY_UPDATEIFCOPY) { + PyArrayObject *base = (PyArrayObject *)PyArray_BASE(arr); PyArray_ENABLEFLAGS(base, NPY_ARRAY_WRITEABLE); - PyArray_CLEARFLAGS(obj, NPY_ARRAY_UPDATEIFCOPY); + PyArray_CLEARFLAGS(arr, NPY_ARRAY_UPDATEIFCOPY); } - Py_DECREF(obj); + Py_DECREF(arr); } } diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c index 93788b123..2304f13d2 100644 --- a/numpy/core/src/multiarray/item_selection.c +++ b/numpy/core/src/multiarray/item_selection.c @@ -29,7 +29,7 @@ PyArray_TakeFrom(PyArrayObject *self0, PyObject *indices0, int axis, { PyArray_Descr *dtype; PyArray_FastTakeFunc *func; - PyArrayObject *obj, *self, *indices; + PyArrayObject *obj = NULL, *self, *indices; intp nd, i, j, n, m, max_item, tmp, chunk, nelem; intp shape[MAX_DIMS]; char *src, *dest; |