From f1e36e25d2acfa238ff2a049e88bba20781ba485 Mon Sep 17 00:00:00 2001
From: Eric Wieser <wieser.eric@gmail.com>
Date: Sat, 10 Feb 2018 07:09:10 -0800
Subject: BUG: Fix travis failure in previous commit (#10566)

---
 numpy/core/src/multiarray/convert_datatype.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'numpy/core/src')

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]);
-- 
cgit v1.2.1