Merge pull request #5104 from juliantaylor/inner-fix

juliantaylor · juliantaylor · commit 38ed773f2f38 · 2014-09-23T23:44:21.000+02:00
BUG: check success of PyArray_DescrFromType in PyArray_InnerProduct
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
@@ -824,6 +824,9 @@ PyArray_InnerProduct(PyObject *op1, PyObject *op2)
     typenum = PyArray_ObjectType(op2, typenum);
 
     typec = PyArray_DescrFromType(typenum);
+    if (typec == NULL) {
+        return NULL;
+    }
     Py_INCREF(typec);
     ap1 = (PyArrayObject *)PyArray_FromAny(op1, typec, 0, 0,
                                         NPY_ARRAY_ALIGNED, NULL);
