summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2009-11-07 21:26:57 +0000
committerPauli Virtanen <pav@iki.fi>2009-11-07 21:26:57 +0000
commit0ff968e53840483d0831e8c1d48d61abb6a34373 (patch)
tree9ba0b52bd48f5b187e3154cd501cac3051f3f27d
parentfaea0c8820fc773a100a4875afb42fe8f1944b3d (diff)
downloadnumpy-0ff968e53840483d0831e8c1d48d61abb6a34373.tar.gz
Fix invariant broken in r7697 -- *axis should be valid after PyArray_CheckAxis
-rw-r--r--numpy/core/src/multiarray/ctors.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index 80a9d7988..d58b0576e 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -2450,7 +2450,7 @@ PyArray_CheckAxis(PyArrayObject *arr, int *axis, int flags)
Py_INCREF(temp1);
*axis = 0;
}
- if (!flags) {
+ if (!flags && *axis == 0) {
return temp1;
}
}