diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-07-31 20:19:53 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-07-31 20:19:53 +0000 |
| commit | 3bbf6b2016feddcc36f0c1c73e87b4d83f928eab (patch) | |
| tree | db81b287ad4b75e6aee77d47705df9a45df611e1 /numpy | |
| parent | 7d50c63082f0f98ef5391603e2f538f99bcd4d4c (diff) | |
| download | numpy-3bbf6b2016feddcc36f0c1c73e87b4d83f928eab.tar.gz | |
Fix segfault from last commit.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 4a96421e8..fde0b1e28 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -4894,6 +4894,10 @@ PyArray_FromString(char *data, intp slen, PyArray_Descr *dtype, PyArrayObject *ret; Bool binary; + + if (dtype == NULL) + dtype=PyArray_DescrFromType(PyArray_DEFAULT); + if (dtype->hasobject) { PyErr_SetString(PyExc_ValueError, "Cannot create an object array from" \ @@ -4901,9 +4905,6 @@ PyArray_FromString(char *data, intp slen, PyArray_Descr *dtype, Py_DECREF(dtype); return NULL; } - - if (dtype == NULL) - dtype=PyArray_DescrFromType(PyArray_DEFAULT); itemsize = dtype->elsize; if (itemsize == 0) { |