summaryrefslogtreecommitdiff
path: root/numpy/core/src
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-01-20 00:57:59 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-01-20 00:57:59 +0000
commitc8ca3be233f0cc830be025f80b18eefcaaf62ccd (patch)
tree5c70333e4de02822f0181fba4eb785844c0f14be /numpy/core/src
parent01597c2bbe93f5d444355fd6efe5322da53bc770 (diff)
downloadnumpy-c8ca3be233f0cc830be025f80b18eefcaaf62ccd.tar.gz
Fix inappropriate DECREF.
Diffstat (limited to 'numpy/core/src')
-rw-r--r--numpy/core/src/multiarraymodule.c10
1 files changed, 5 insertions, 5 deletions
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: