Undo size-0 iteration changes and fix possible core dump in PyArray_Return.

teoliphant · teoliphant · commit ff02df4a7561 · 2006-01-09T02:44:21.000Z
diff --git a/THANKS.txt b/THANKS.txt
@@ -14,3 +14,4 @@ Travis Vaught and Joe Cooper for administration of numpy.org web site and SVN
 Eric Firing for bugfixes.
 Arnd Baecker for 64-bit testing
 David Cooke for many code improvements including the auto-generated C-API
+Alexander Belopolsky (sasha) for Masked array bug-fixes and tests...
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
@@ -916,6 +916,8 @@ PyArray_Return(PyArrayObject *mp)
                 return NULL;
         }
 
+	if (!PyArray_Check(mp)) return (PyObject *)mp;
+	
 	if (mp->nd == 0) {
 		PyObject *ret;
 		ret = PyArray_ToScalar(mp->data, mp);
@@ -6215,11 +6217,6 @@ PyArray_IterNew(PyObject *obj)
         Py_INCREF(ao);
         it->ao = ao;
 	it->size = PyArray_SIZE(ao);
-	if (it->size == 0) {
-		PyErr_SetString(PyExc_ValueError, 
-				"Cannot iterate over a size-0 array");
-		return NULL;
-	}
 	it->nd_m1 = nd - 1;
 	it->factors[nd-1] = 1;
 	for (i=0; i < nd; i++) {
