diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-03-09 17:22:42 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-03-09 17:22:42 +0000 |
| commit | d9b8b7634b222b6bd464a3802e0f464a25c28d4b (patch) | |
| tree | db8256b7394a41ff17f54ddabdf210a4a7774f44 /numpy/core/src/multiarraymodule.c | |
| parent | e62aa7ea3603ac5d7eb7b94da328aaed5868c8d0 (diff) | |
| download | numpy-d9b8b7634b222b6bd464a3802e0f464a25c28d4b.tar.gz | |
Fix #947.
Diffstat (limited to 'numpy/core/src/multiarraymodule.c')
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index f22f9720d..a85ce2dc0 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -6264,9 +6264,15 @@ _array_fromobject(PyObject *NPY_UNUSED(ignored), PyObject *args, PyObject *kws) PyArray_OrderConverter, &order, PyArray_BoolConverter, &subok, &ndmin)) { - goto clean_type; + goto clean_type; } + if (ndmin > NPY_MAXDIMS) { + PyErr_Format(PyExc_ValueError, + "ndmin bigger than allowable number of dimensions "\ + "NPY_MAXDIMS (=%d)", NPY_MAXDIMS); + goto clean_type; + } /* fast exit if simple call */ if ((subok && PyArray_Check(op)) || (!subok && PyArray_CheckExact(op))) { |