Merge pull request #28201 from ngoldbaum/fix-2.2.2-bug

charris · web-flow · commit 887f11e8409e · 2025-01-20T14:33:39.000-07:00
BUG: fix data race in a more minimal way on stable branch
diff --git a/numpy/_core/src/multiarray/ctors.c b/numpy/_core/src/multiarray/ctors.c
@@ -1829,12 +1829,18 @@ PyArray_CheckFromAny_int(PyObject *op, PyArray_Descr *in_descr,
 {
     PyObject *obj;
     if (requires & NPY_ARRAY_NOTSWAPPED) {
-        if (!in_descr && PyArray_Check(op)) {
-            in_descr = PyArray_DESCR((PyArrayObject *)op);
-            Py_INCREF(in_descr);
+        if (!in_descr && PyArray_Check(op) &&
+                PyArray_ISBYTESWAPPED((PyArrayObject* )op)) {
+            in_descr = PyArray_DescrNew(PyArray_DESCR((PyArrayObject *)op));
+            if (in_descr == NULL) {
+                return NULL;
+            }
+        }
+        else if (in_descr && !PyArray_ISNBO(in_descr->byteorder)) {
+            PyArray_DESCR_REPLACE(in_descr);
         }
-        if (in_descr) {
-            PyArray_DESCR_REPLACE_CANONICAL(in_descr);
+        if (in_descr && in_descr->byteorder != NPY_IGNORE && in_descr->byteorder != NPY_NATIVE) {
+            in_descr->byteorder = NPY_NATIVE;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1829,12 +1829,18 @@ PyArray_CheckFromAny_int(PyObject op, PyArray_Descr in_descr,`
`1829`	`1829`	`{`
`1830`	`1830`	`PyObject *obj;`
`1831`	`1831`	`if (requires & NPY_ARRAY_NOTSWAPPED) {`
`1832`		`- if (!in_descr && PyArray_Check(op)) {`
`1833`		`- in_descr = PyArray_DESCR((PyArrayObject *)op);`
`1834`		`- Py_INCREF(in_descr);`
	`1832`	`+ if (!in_descr && PyArray_Check(op) &&`
	`1833`	`+ PyArray_ISBYTESWAPPED((PyArrayObject* )op)) {`
	`1834`	`+ in_descr = PyArray_DescrNew(PyArray_DESCR((PyArrayObject *)op));`
	`1835`	`+ if (in_descr == NULL) {`
	`1836`	`+ return NULL;`
	`1837`	`+ }`
	`1838`	`+ }`
	`1839`	`+ else if (in_descr && !PyArray_ISNBO(in_descr->byteorder)) {`
	`1840`	`+ PyArray_DESCR_REPLACE(in_descr);`
`1835`	`1841`	`}`
`1836`		`- if (in_descr) {`
`1837`		`- PyArray_DESCR_REPLACE_CANONICAL(in_descr);`
	`1842`	`+ if (in_descr && in_descr->byteorder != NPY_IGNORE && in_descr->byteorder != NPY_NATIVE) {`
	`1843`	`+ in_descr->byteorder = NPY_NATIVE;`
`1838`	`1844`	`}`
`1839`	`1845`	`}`
`1840`	`1846`