diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-20 00:57:59 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-20 00:57:59 +0000 |
| commit | c8ca3be233f0cc830be025f80b18eefcaaf62ccd (patch) | |
| tree | 5c70333e4de02822f0181fba4eb785844c0f14be /numpy | |
| parent | 01597c2bbe93f5d444355fd6efe5322da53bc770 (diff) | |
| download | numpy-c8ca3be233f0cc830be025f80b18eefcaaf62ccd.tar.gz | |
Fix inappropriate DECREF.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/arrayobject.h | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/numpy/core/include/numpy/arrayobject.h b/numpy/core/include/numpy/arrayobject.h index fca45e2de..9d2ebab4b 100644 --- a/numpy/core/include/numpy/arrayobject.h +++ b/numpy/core/include/numpy/arrayobject.h @@ -1342,8 +1342,8 @@ typedef struct { PyUnicode_Check(obj)) #define PyArray_IsAnyScalar(obj) \ (PyArray_IsScalar(obj, Generic) || PyArray_IsPythonScalar(obj)) -#define PyArray_CheckAnyScalar(obj) (PyArray_CheckScalar(obj) || \ - PyArray_IsPythonScalar(obj)) +#define PyArray_CheckAnyScalar(obj) (PyArray_IsPythonScalar(obj) || \ + PyArray_CheckScalar(obj)) #define PyArray_GETCONTIGUOUS(m) (PyArray_ISCONTIGUOUS(m) ? Py_INCREF(m), m : \ (PyArrayObject *)(PyArray_Copy(m))) diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 2f7fafe81..1dc9260e8 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -1467,14 +1467,14 @@ PyArray_ConvertToCommonType(PyObject *op, int *retn) flags |= FORCECAST; Py_DECREF(Py_None); } + Py_INCREF(intype); mps[i] = (PyArrayObject*) - PyArray_CheckFromAny(otmp, intype, 0, 0, flags, NULL); + PyArray_FromAny(otmp, intype, 0, 0, flags, NULL); Py_DECREF(otmp); - Py_XDECREF(stype); - stype=NULL; - intype=NULL; if (mps[i] == NULL) goto fail; - } + } + Py_DECREF(intype); + Py_XDECREF(stype); return mps; fail: |