diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2018-02-10 07:09:10 -0800 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2018-02-10 08:09:10 -0700 |
| commit | f1e36e25d2acfa238ff2a049e88bba20781ba485 (patch) | |
| tree | 7cbd746589fe322d57877b76e4025799a8ca92d6 /numpy | |
| parent | 30d8feec54abc180979a7db8df07150cfae5201f (diff) | |
| download | numpy-f1e36e25d2acfa238ff2a049e88bba20781ba485.tar.gz | |
BUG: Fix travis failure in previous commit (#10566)
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/convert_datatype.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c index 2effedb11..d355e191c 100644 --- a/numpy/core/src/multiarray/convert_datatype.c +++ b/numpy/core/src/multiarray/convert_datatype.c @@ -1765,7 +1765,8 @@ PyArray_ResultType(npy_intp narrs, PyArrayObject **arr, PyArray_Descr **all_dtypes = PyArray_malloc( sizeof(*all_dtypes) * (narrs + ndtypes)); if (all_dtypes == NULL) { - return PyErr_NoMemory(); + PyErr_NoMemory(); + return NULL; } for (i = 0; i < narrs; ++i) { all_dtypes[i] = PyArray_DESCR(arr[i]); |