Assign m_arr = tmp in more cases

jkseppan · jkseppan · commit c0e09d5e96b0 · 2015-09-21T21:09:28.000+03:00
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -444,11 +444,14 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                 m_shape = zeros;
                 m_strides = zeros;
 		if (PyArray_NDIM(tmp) == 0 && ND == 0) {
+		    m_arr = tmp;
 		    return 1;
 		}
             }
 	    if (PyArray_NDIM(tmp) > 0 && PyArray_DIM(tmp, 0) == 0) {
 		// accept dimension mismatch for empty arrays
+		Py_XDECREF(m_arr);
+		m_arr = tmp;
 		return 1;
 	    }
 	    if (PyArray_NDIM(tmp) != ND) {

Original file line number	Diff line number	Diff line change
`@@ -444,11 +444,14 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`444`	`444`	`m_shape = zeros;`
`445`	`445`	`m_strides = zeros;`
`446`	`446`	`if (PyArray_NDIM(tmp) == 0 && ND == 0) {`
	`447`	`+ m_arr = tmp;`
`447`	`448`	`return 1;`
`448`	`449`	`}`
`449`	`450`	`}`
`450`	`451`	`if (PyArray_NDIM(tmp) > 0 && PyArray_DIM(tmp, 0) == 0) {`
`451`	`452`	`// accept dimension mismatch for empty arrays`
	`453`	`+ Py_XDECREF(m_arr);`
	`454`	`+ m_arr = tmp;`
`452`	`455`	`return 1;`
`453`	`456`	`}`
`454`	`457`	`if (PyArray_NDIM(tmp) != ND) {`