Commitd81f0ae

authored

Merge pull request#25121 from charris/backport-25042

BUG: ensure passing ``np.dtype`` to itself doesn't crash

2 parentscefdd34 +766d5a8 commitd81f0aeCopy full SHA for d81f0ae

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1478,6 +1478,11 @@ PyArray_DTypeOrDescrConverterRequired(PyObject obj, npy_dtype_info dt_info)`
`1478`	`1478`	`dt_info->descr=NULL;`
`1479`	`1479`
`1480`	`1480`	`if (PyObject_TypeCheck(obj,&PyArrayDTypeMeta_Type)) {`
	`1481`	`+if (obj== (PyObject*)&PyArrayDescr_Type) {`
	`1482`	`+PyErr_SetString(PyExc_TypeError,`
	`1483`	`+"Cannot convert np.dtype into a dtype.");`
	`1484`	`+returnNPY_FAIL;`
	`1485`	`+ }`
`1481`	`1486`	`Py_INCREF(obj);`
`1482`	`1487`	`dt_info->dtype= (PyArray_DTypeMeta*)obj;`
`1483`	`1488`	`dt_info->descr=NULL;`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1898,3 +1898,9 @@ def test_result_type_integers_and_unitless_timedelta64():`
`1898`	`1898`	`td=np.timedelta64(4)`
`1899`	`1899`	`result=np.result_type(0,td)`
`1900`	`1900`	`assert_dtype_equal(result,td.dtype)`
	`1901`	`+`
	`1902`	`+`
	`1903`	`+deftest_creating_dtype_with_dtype_class_errors():`
	`1904`	+# Regression test for #25031, calling `np.dtype` with itself segfaulted.
	`1905`	`+withpytest.raises(TypeError,match="Cannot convert np.dtype into a"):`
	`1906`	`+np.array(np.ones(10),dtype=np.dtype)`

Comments

(0)