certik
commented
12 years ago Still fixes it:
diff --git a/numpy/core/src/multiarray/calculation.c b/numpy/core/src/multiarray/calculation.c
index 618a871..4254d2f 100644
--- a/numpy/core/src/multiarray/calculation.c
+++ b/numpy/core/src/multiarray/calculation.c
@@ -959,12 +959,12 @@ PyArray_Clip(PyArrayObject *self, PyObject *min, PyObject *max, PyArrayObject *o
indescr = PyArray_DESCR(self);
Py_INCREF(indescr);
}
- Py_DECREF(newdescr);
+ //Py_DECREF(newdescr);
if (!PyDataType_ISNOTSWAPPED(indescr)) {
PyArray_Descr *descr2;
descr2 = PyArray_DescrNewByteorder(indescr, '=');
- Py_DECREF(indescr);
+ //Py_DECREF(indescr);
if (descr2 == NULL) {
goto fail;
}
@@ -981,7 +981,7 @@ PyArray_Clip(PyArrayObject *self, PyObject *min, PyObject *max, PyArrayObject *o
}
else {
/* Side-effect of PyArray_FromAny */
- Py_DECREF(indescr);
+ //Py_DECREF(indescr);
}
/*
@@ -998,14 +998,14 @@ PyArray_Clip(PyArrayObject *self, PyObject *min, PyObject *max, PyArrayObject *o
zero = PyInt_FromLong(0);
cmp = PyObject_RichCompareBool(min, zero, Py_LT);
if (cmp == -1) {
- Py_DECREF(zero);
+ //Py_DECREF(zero);
goto fail;
}
if (cmp == 1) {
min = zero;
}
else {
- Py_DECREF(zero);
+ //Py_DECREF(zero);
Py_INCREF(min);
}
}
@@ -1017,7 +1017,7 @@ PyArray_Clip(PyArrayObject *self, PyObject *min, PyObject *max, PyArrayObject *o
Py_INCREF(indescr);
mina = (PyArrayObject *)PyArray_FromAny(min, indescr, 0, 0,
NPY_ARRAY_DEFAULT, NULL);
- Py_DECREF(min);
+ //Py_DECREF(min);
if (mina == NULL) {
goto fail;
}
@@ -1149,9 +1149,9 @@ PyArray_Clip(PyArrayObject *self, PyObject *min, PyObject *max, PyArrayObject *o
/* Clean up temporary variables */
Py_XDECREF(mina);
Py_XDECREF(maxa);
- Py_DECREF(newin);
+ //Py_DECREF(newin);
/* Copy back into out if out was not already a nice array. */
- Py_DECREF(newout);
+ //Py_DECREF(newout);
return (PyObject *)out;
fail:
charris
This issue is for the ticket:
http://projects.scipy.org/numpy/ticket/1588
Because the trac server is unreliable (frequently fails and I need to wait couple minutes for the database to be unlocked again --- see my email to the numpy list) and I need to keep track of my progress.
Summary of the problem
The following patch fixes it, but probably creates a leak sometimes:
This code was first introduced by 9405a8703f6df655c17cdefc02f9977f92d3b2d8 and the moved around later. There is no problem with this commit. The actual segfault was introduced between the commits 9a9f08e089ff49fccca1feac9620c2837f8c09bd (good) and 64e30a7261e5a575a12beed1c3971f80779760f1 (bad). Overall diff of these is: https://github.com/numpy/numpy/compare/9a9f08e089ff49fccca1feac9620c2837f8c09bd...64e30a7261e5a575a12beed1c3971f80779760f1
The problem might be in the changes in the
ctors.cfile. At the moment, the correct fix (without leaks) is unclear. See the comments below for detailed analysis.