MAINT: Clean up error path (DescrFromType cannot fail for simple buil…

…tins) But move the error check to be higher up and thus more directly relevant. If `PyArray_DescrFromType` could have failed, the code would have been incorrect anyway.
numpy · ngoldbaum · Oct 24, 2023 · Jun 9, 2023 · Jun 9, 2023 · Jun 9, 2023
commit bf0ff21419f2d0f43c646e72b758e73a9cdf1b4b
diff --git a/numpy/_core/src/multiarray/multiarraymodule.c b/numpy/_core/src/multiarray/multiarraymodule.c
@@ -3297,15 +3297,14 @@ PyArray_Where(PyObject *condition, PyObject *x, PyObject *y)
         NPY_ITER_READONLY | NPY_ITER_ALIGNED
     };
     common_dt = PyArray_ResultType(2, &op_in[2], 0, NULL);
+    if (common_dt == NULL) {
+        goto fail;
+        }
     PyArray_Descr * op_dt[4] = {common_dt, PyArray_DescrFromType(NPY_BOOL),
                                 common_dt, common_dt};
     NpyIter * iter;
     NPY_BEGIN_THREADS_DEF;
 
-    if (common_dt == NULL || op_dt[1] == NULL) {
-        Py_XDECREF(op_dt[1]);
-        goto fail;
-    }
     iter =  NpyIter_MultiNew(
             4, op_in, flags, NPY_KEEPORDER, NPY_UNSAFE_CASTING,
             op_flags, op_dt);