summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-04-23 12:54:29 -0400
committerCharles Harris <charlesr.harris@gmail.com>2015-04-23 12:54:29 -0400
commiteb81ac4f57e8e4b1ad28188b5e0e2dc9135b5c10 (patch)
treec61a6ffbc855638b138ddeb22b57fb9cba89a671
parentea1036cc11d74d7f2a795723f12ab28456e5ab62 (diff)
parent8a590fb4b0d54eee8115b15169ce092b74616f64 (diff)
downloadnumpy-eb81ac4f57e8e4b1ad28188b5e0e2dc9135b5c10.tar.gz
Merge pull request #5784 from jaimefrio/list_overflow
BUG: Use npy_intp instead of int in ctors.c
-rw-r--r--numpy/core/src/multiarray/ctors.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index e88e17028..70161bf74 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -568,7 +568,8 @@ PyArray_AssignFromSequence(PyArrayObject *self, PyObject *v)
static int
discover_itemsize(PyObject *s, int nd, int *itemsize, int string_type)
{
- int n, r, i;
+ int r;
+ npy_intp n, i;
if (PyArray_Check(s)) {
*itemsize = PyArray_MAX(*itemsize, PyArray_ITEMSIZE((PyArrayObject *)s));
@@ -645,7 +646,8 @@ discover_dimensions(PyObject *obj, int *maxndim, npy_intp *d, int check_it,
int *out_is_object)
{
PyObject *e;
- int r, n, i;
+ int r;
+ npy_intp n, i;
Py_buffer buffer_view;
PyObject * seq;