BUG: initialize op_axes when only itershape is given

seberg · seberg · commit e12dc1cf32da · 2013-03-01T18:29:07.000+01:00
In this case, the initialization used the number of dimensions instead
of setting it to NULL for each operand, leading to possible segmentation
faults.
diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c
@@ -786,7 +786,7 @@ npyiter_init(NewNpyArrayIterObject *self, PyObject *args, PyObject *kwds)
     if (itershape.len > 0) {
         if (oa_ndim == 0) {
             oa_ndim = itershape.len;
-            memset(op_axes, 0, sizeof(op_axes[0])*oa_ndim);
+            memset(op_axes, 0, sizeof(op_axes[0]) * nop);
         }
         else if (oa_ndim != itershape.len) {
             PyErr_SetString(PyExc_ValueError,
diff --git a/numpy/core/tests/test_nditer.py b/numpy/core/tests/test_nditer.py
@@ -598,6 +598,8 @@ def test_iter_itershape():
                             [['readonly'], ['writeonly','allocate']],
                             op_axes=[[0,1,None], None],
                             itershape=(-1,1,4))
+    # Test bug that for no op_axes but itershape, they are NULLed correctly
+    i = np.nditer([np.ones(2), None, None], itershape=(2,))
 
 def test_iter_broadcasting_errors():
     # Check that errors are thrown for bad broadcasting shapes

Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,7 @@ npyiter_init(NewNpyArrayIterObject self, PyObject args, PyObject *kwds)`
`786`	`786`	`if (itershape.len > 0) {`
`787`	`787`	`if (oa_ndim == 0) {`
`788`	`788`	`oa_ndim = itershape.len;`
`789`		`- memset(op_axes, 0, sizeof(op_axes[0])*oa_ndim);`
	`789`	`+ memset(op_axes, 0, sizeof(op_axes[0]) * nop);`
`790`	`790`	`}`
`791`	`791`	`else if (oa_ndim != itershape.len) {`
`792`	`792`	`PyErr_SetString(PyExc_ValueError,`