diff options
| author | Christopher L. Farrow <cfarrow@enthought.com> | 2011-08-04 17:47:04 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-10-02 09:09:39 -0600 |
| commit | 3927c3aa28ea2ed8dbb5228de3e69928972da412 (patch) | |
| tree | a963d804b97a5925c7df99db20a2b5291976537a | |
| parent | 3a7e61c7d55be9a84929747c38cd71e62593129d (diff) | |
| download | numpy-3927c3aa28ea2ed8dbb5228de3e69928972da412.tar.gz | |
BUG: porting bugfix from refactor @ 3da77df
| -rw-r--r-- | numpy/core/src/multiarray/ctors.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index d7c17e8ad..ac1cdc13a 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -3698,6 +3698,9 @@ PyArray_FromString(char *data, npy_intp slen, PyArray_Descr *dtype, if (dtype == NULL) { dtype=PyArray_DescrFromType(NPY_DEFAULT_TYPE); + if (dtype == NULL) { + return NULL; + } } if (PyDataType_FLAGCHK(dtype, NPY_ITEM_IS_POINTER) || PyDataType_REFCHK(dtype)) { |