summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--numpy/core/src/arrayobject.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 65ea47649..45c5c9ee0 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -7804,10 +7804,12 @@ PyArray_CheckFromAny(PyObject *op, PyArray_Descr *descr, int min_depth,
!PyArray_ISNBO(PyArray_DESCR(op)->byteorder)) {
descr = PyArray_DescrNew(PyArray_DESCR(op));
}
- else if ((descr && !PyArray_ISNBO(descr->byteorder))) {
+ else if (descr && !PyArray_ISNBO(descr->byteorder)) {
PyArray_DESCR_REPLACE(descr);
- }
- descr->byteorder = PyArray_NATIVE;
+ }
+ if (descr) {
+ descr->byteorder = PyArray_NATIVE;
+ }
}
obj = PyArray_FromAny(op, descr, min_depth, max_depth,