Consider all possible code paths

mtsokol · mtsokol · commit 107d41995cfe · 2025-09-09T21:47:11.000Z
diff --git a/numpy/_core/src/multiarray/methods.c b/numpy/_core/src/multiarray/methods.c
@@ -962,17 +962,19 @@ array_getarray(PyArrayObject *self, PyObject *args, PyObject *kwds)
     if (copy == NPY_COPY_ALWAYS) {
         if (newtype == NULL) {
             newtype = PyArray_DESCR(self);
+            Py_INCREF(newtype);
         }
-        Py_INCREF(newtype);
         ret = PyArray_CastToType(self, newtype, 0);
         Py_DECREF(self);
         return ret;
     } else { // copy == NPY_COPY_IF_NEEDED || copy == NPY_COPY_NEVER
-        if (newtype == NULL || PyArray_EquivTypes(PyArray_DESCR(self), newtype)) {
+        if (newtype == NULL) {
+            return (PyObject *)self;
+        } else if (PyArray_EquivTypes(PyArray_DESCR(self), newtype)) {
+            Py_DECREF(newtype);
             return (PyObject *)self;
         }
         if (copy == NPY_COPY_IF_NEEDED) {
-            Py_INCREF(newtype);
             ret = PyArray_CastToType(self, newtype, 0);
             Py_DECREF(self);
             return ret;
diff --git a/numpy/_core/tests/test_api.py b/numpy/_core/tests/test_api.py
@@ -99,16 +99,28 @@ def custom__array__(self, dtype=None, copy=None):
     assert_equal(np.array(o, dtype=np.float64), np.array(100.0, np.float64))
     if HAS_REFCOUNT:
         class MyArray:
-            def __init__(self):
-                self.val = np.array(-1, dtype=dt)
+            def __init__(self, dtype):
+                self.val = np.array(-1, dtype=dtype)
 
             def __array__(self, dtype=None, copy=None):
                 return self.val.__array__(dtype=dtype, copy=copy)
 
         dt = np.dtype(np.int32)
         old_refcount = sys.getrefcount(dt)
-        np.array(MyArray())
+        np.array(MyArray(dt))
         assert_equal(old_refcount, sys.getrefcount(dt))
+        np.array(MyArray(dt), dtype=dt)
+        assert_equal(old_refcount, sys.getrefcount(dt))
+        np.array(MyArray(dt), copy=None)
+        assert_equal(old_refcount, sys.getrefcount(dt))
+        np.array(MyArray(dt), dtype=dt, copy=None)
+        assert_equal(old_refcount, sys.getrefcount(dt))
+        dt2 = np.dtype(np.int16)
+        old_refcount2 = sys.getrefcount(dt2)
+        np.array(MyArray(dt), dtype=dt2)
+        assert_equal(old_refcount2, sys.getrefcount(dt2))
+        np.array(MyArray(dt), dtype=dt2, copy=None)
+        assert_equal(old_refcount2, sys.getrefcount(dt2))
 
     # test recursion
     nested = 1.5
