summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2012-08-04 05:35:48 -0700
committerCharles Harris <charlesr.harris@gmail.com>2012-08-04 05:35:48 -0700
commitfcdbcac4fa300a81e687fe93a956b54e7a6f7db5 (patch)
tree86f8c67e1b4e068cfc0ec6bbef0596505eddb840
parent4676f33f9c77b04e9c599e642de7ab465f48ea8f (diff)
parent8a4e0f57844452ceca43388cb87f5a53c3471c80 (diff)
downloadnumpy-fcdbcac4fa300a81e687fe93a956b54e7a6f7db5.tar.gz
Merge pull request #373 from cianci/concatenate_leak_fix
Fix memory leak in concatenate.
-rw-r--r--numpy/core/src/multiarray/multiarraymodule.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 1b9be3cd9..8bdcc2c20 100644
--- 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 @@ fail:
for (iarrays = 0; iarrays < narrays; ++iarrays) {
Py_DECREF(arrays[iarrays]);
}
+ PyArray_free(arrays);
return NULL;
}