Merge pull request #373 from cianci/concatenate_leak_fix

charris · charris · commit fcdbcac4fa30 · 2012-08-04T05:35:48.000-07:00
Fix memory leak in concatenate.
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
@@ -602,6 +602,7 @@ PyArray_Concatenate(PyObject *op, int axis)
     for (iarrays = 0; iarrays < narrays; ++iarrays) {
         Py_DECREF(arrays[iarrays]);
     }
+    PyArray_free(arrays);
 
     return (PyObject *)ret;
 
@@ -610,6 +611,7 @@ PyArray_Concatenate(PyObject *op, int axis)
     for (iarrays = 0; iarrays < narrays; ++iarrays) {
         Py_DECREF(arrays[iarrays]);
     }
+    PyArray_free(arrays);
 
     return NULL;
 }

Original file line number	Diff line number	Diff line change
`@@ -602,6 +602,7 @@ PyArray_Concatenate(PyObject *op, int axis)`
`602`	`602`	`for (iarrays = 0; iarrays < narrays; ++iarrays) {`
`603`	`603`	`Py_DECREF(arrays[iarrays]);`
`604`	`604`	`}`
	`605`	`+ PyArray_free(arrays);`
`605`	`606`
`606`	`607`	`return (PyObject *)ret;`
`607`	`608`
`@@ -610,6 +611,7 @@ PyArray_Concatenate(PyObject *op, int axis)`
`610`	`611`	`for (iarrays = 0; iarrays < narrays; ++iarrays) {`
`611`	`612`	`Py_DECREF(arrays[iarrays]);`
`612`	`613`	`}`
	`614`	`+ PyArray_free(arrays);`
`613`	`615`
`614`	`616`	`return NULL;`
`615`	`617`	`}`