Merge pull request #20986 from charris/backport-20980

charris · web-flow · commit da47aa2c3d1d · 2022-02-02T19:11:51.000-07:00
BUG: Fix misplaced return.
diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c
@@ -3021,9 +3021,9 @@ init_cast_info(NPY_cast_info *cast_info, NPY_CASTING *casting,
         if (!PyErr_Occurred()) {
             PyErr_Format(PyExc_TypeError,
                     "Cannot cast array data from %R to %R.", src_dtype, dst_dtype);
-            Py_DECREF(meth);
-            return -1;
         }
+        Py_DECREF(meth);
+        return -1;
     }
     assert(PyArray_DescrCheck(cast_info->descriptors[0]));
     assert(PyArray_DescrCheck(cast_info->descriptors[1]));

Original file line number	Diff line number	Diff line change
`@@ -3021,9 +3021,9 @@ init_cast_info(NPY_cast_info cast_info, NPY_CASTING casting,`
`3021`	`3021`	`if (!PyErr_Occurred()) {`
`3022`	`3022`	`PyErr_Format(PyExc_TypeError,`
`3023`	`3023`	`"Cannot cast array data from %R to %R.", src_dtype, dst_dtype);`
`3024`		`- Py_DECREF(meth);`
`3025`		`- return -1;`
`3026`	`3024`	`}`
	`3025`	`+ Py_DECREF(meth);`
	`3026`	`+ return -1;`
`3027`	`3027`	`}`
`3028`	`3028`	`assert(PyArray_DescrCheck(cast_info->descriptors[0]));`
`3029`	`3029`	`assert(PyArray_DescrCheck(cast_info->descriptors[1]));`