Merge pull request #25042 from ngoldbaum/fix-dtype-autophagia-segfault

seberg · web-flow · commit 95ca101b54a7 · 2023-11-01T08:46:21.000+01:00
BUG: ensure passing `np.dtype` to itself doesn't crash
diff --git a/numpy/_core/src/multiarray/descriptor.c b/numpy/_core/src/multiarray/descriptor.c
@@ -1479,6 +1479,11 @@ PyArray_DTypeOrDescrConverterRequired(PyObject *obj, npy_dtype_info *dt_info)
     dt_info->descr = NULL;
 
     if (PyObject_TypeCheck(obj, &PyArrayDTypeMeta_Type)) {
+        if (obj == (PyObject *)&PyArrayDescr_Type) {
+            PyErr_SetString(PyExc_TypeError,
+                            "Cannot convert np.dtype into a dtype.");
+            return NPY_FAIL;
+        }
         Py_INCREF(obj);
         dt_info->dtype = (PyArray_DTypeMeta *)obj;
         dt_info->descr = NULL;
diff --git a/numpy/_core/tests/test_dtype.py b/numpy/_core/tests/test_dtype.py
@@ -1931,3 +1931,9 @@ def test_result_type_integers_and_unitless_timedelta64():
     td = np.timedelta64(4)
     result = np.result_type(0, td)
     assert_dtype_equal(result, td.dtype)
+
+
+def test_creating_dtype_with_dtype_class_errors():
+    # Regression test for #25031, calling `np.dtype` with itself segfaulted.
+    with pytest.raises(TypeError, match="Cannot convert np.dtype into a"):
+        np.array(np.ones(10), dtype=np.dtype)
