Merge pull request #5314 from hensing/master

charris · charris · commit 710be5b4c61a · 2014-11-29T11:15:54.000-05:00
BUG: Closes #5313: PyArray_AsCArray caused segfault with 3D-arrays
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
@@ -227,7 +227,7 @@ PyArray_AsCArray(PyObject **op, void *ptr, npy_intp *dims, int nd,
             goto fail;
         }
         for (i = 0; i < n; i++) {
-            ptr3[i] = ptr3[n + (m-1)*i];
+            ptr3[i] = (char **) &ptr3[n + m * i];
             for (j = 0; j < m; j++) {
                 ptr3[i][j] = PyArray_BYTES(ap) + i*PyArray_STRIDES(ap)[0] + j*PyArray_STRIDES(ap)[1];
             }

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ PyArray_AsCArray(PyObject *op, void ptr, npy_intp *dims, int nd,`
`227`	`227`	`goto fail;`
`228`	`228`	`}`
`229`	`229`	`for (i = 0; i < n; i++) {`
`230`		`- ptr3[i] = ptr3[n + (m-1)*i];`
	`230`	`+ ptr3[i] = (char *) &ptr3[n + m i];`
`231`	`231`	`for (j = 0; j < m; j++) {`
`232`	`232`	`ptr3[i][j] = PyArray_BYTES(ap) + iPyArray_STRIDES(ap)[0] + jPyArray_STRIDES(ap)[1];`
`233`	`233`	`}`