From 3c64ccdb050e56a0b112995d4d359c2017d4a4cd Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Fri, 27 Oct 2006 16:56:32 +0000
Subject: Allow subtypes of all array scalars and fix-up scalar_value to accept
 sub-types.

---
 numpy/core/src/arrayobject.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'numpy/core/src/arrayobject.c')

diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index cafba4e2c..65f929966 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -1432,6 +1432,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
         }
         else {
                 destptr = scalar_value(obj, descr);
+                if (destptr == NULL) {Py_DECREF(obj); return NULL;}
         }
         /* copyswap for OBJECT increments the reference count */
         copyswap(destptr, data, swap, base);
-- 
cgit v1.2.1