Merge pull request #23941 from seberg/einsum-err-cleanup

BUG: Fix NpyIter cleanup in einsum error path
numpy · Jun 14, 2023 · 26edc98 · 26edc98
2 parents 59e8c62 + e87676e
commit 26edc98
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src
@@ -814,7 +814,7 @@ PyArray_EinsteinSum(char *subscripts, npy_intp nop,
     int *op_axes[NPY_MAXARGS];
     npy_uint32 iter_flags, op_flags[NPY_MAXARGS];
 
-    NpyIter *iter;
+    NpyIter *iter = NULL;
     sum_of_products_fn sop;
     npy_intp fixed_strides[NPY_MAXARGS];
 
@@ -1133,7 +1133,6 @@ PyArray_EinsteinSum(char *subscripts, npy_intp nop,
 
         iternext = NpyIter_GetIterNext(iter, NULL);
         if (iternext == NULL) {
-            NpyIter_Deallocate(iter);
             goto fail;
         }
         dataptr = NpyIter_GetDataPtrArray(iter);
@@ -1168,6 +1167,7 @@ finish:
     return ret;
 
 fail:
+    NpyIter_Deallocate(iter);
     for (iop = 0; iop < nop; ++iop) {
         Py_XDECREF(op[iop]);
     }