Merge pull request numpy#4784 from jaimefrio/iter-dealloc-gufunc

BUG: Avoid double iterator deallocation in `ufunc_object.c`
jonathanrocher · Jun 5, 2014 · 4c854c2 · 4c854c2
2 parents 805e11a + a95c8e4
commit 4c854c2
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
@@ -1761,7 +1761,7 @@ make_arr_prep_args(npy_intp nin, PyObject *args, PyObject *kwds)
  *            may be null, in which case the thread global one is fetched
  *  - ufunc_name: name of ufunc
  */
-static int 
+static int
 _check_ufunc_fperr(int errmask, PyObject *extobj, char* ufunc_name) {
     int fperr;
     PyObject *errobj = NULL;
@@ -2230,7 +2230,6 @@ PyUFunc_GeneralizedFunction(PyUFuncObject *ufunc,
         /* Get the variables needed for the loop */
         iternext = NpyIter_GetIterNext(iter, NULL);
         if (iternext == NULL) {
-            NpyIter_Deallocate(iter);
             retval = -1;
             goto fail;
         }