From ece9e80e8eb587ed11958403a34fb8b9de0fdb51 Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Thu, 12 Jan 2006 14:30:37 +0000
Subject: Fix segfault in constructor when dtype not given.

---
 numpy/core/src/arrayobject.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 3ea85c692..91c149a41 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -3884,15 +3884,20 @@ array_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
                                          &strides,
                                          &fortran)) 
 		goto fail;
-	
+
+
+	if (descr == NULL)
+		descr = PyArray_DescrFromType(PyArray_LONG);
+
 	type_num = descr->type_num;
-	itemsize = descr->elsize;	
+	itemsize = descr->elsize;
 
         if (dims.ptr == NULL) {
                 PyErr_SetString(PyExc_ValueError, "need to give a "\
                                 "valid shape as the first argument");
                 goto fail;
         }
+
         if (buffer.ptr == NULL) {
                 ret = (PyArrayObject *)\
 			PyArray_NewFromDescr(subtype, descr,
-- 
cgit v1.2.1