Merge pull request numpy#12528 from ahaldane/fix_reshape_getitem

mattip · web-flow · commit 53fdc54545ad · 2018-12-11T00:07:48.000+02:00
MAINT: fix an unsafe PyTuple_GET_ITEM call
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
@@ -187,7 +187,7 @@ array_reshape(PyArrayObject *self, PyObject *args, PyObject *kwds)
     }
 
     if (n <= 1) {
-        if (PyTuple_GET_ITEM(args, 0) == Py_None) {
+        if (n != 0 && PyTuple_GET_ITEM(args, 0) == Py_None) {
             return PyArray_View(self, NULL, NULL);
         }
         if (!PyArg_ParseTuple(args, "O&:reshape", PyArray_IntpConverter,

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ array_reshape(PyArrayObject self, PyObject args, PyObject *kwds)`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`if (n <= 1) {`
`190`		`- if (PyTuple_GET_ITEM(args, 0) == Py_None) {`
	`190`	`+ if (n != 0 && PyTuple_GET_ITEM(args, 0) == Py_None) {`
`191`	`191`	`return PyArray_View(self, NULL, NULL);`
`192`	`192`	`}`
`193`	`193`	`if (!PyArg_ParseTuple(args, "O&:reshape", PyArray_IntpConverter,`