summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-05-03 19:32:17 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-05-03 19:32:17 +0200
commite6f5f498d508335f359cd2d01a1098afcbcb1b6c (patch)
treee537bbac8e4f96601442f8add9b05618dabe302c
parentb1a2bcaff2ad130386ea1ffe75b06004dc3aca28 (diff)
downloadpsutil-e6f5f498d508335f359cd2d01a1098afcbcb1b6c.tar.gz
fix 1050: memory leak in memory_maps() on Windows because we forgot to Py_DECREF
-rw-r--r--HISTORY.rst1
-rw-r--r--psutil/_psutil_windows.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 67213b2c..c193dfc8 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -37,6 +37,7 @@
None
- 1046_: [Windows] disk_partitions() on Windows overrides user's SetErrorMode.
- 1047_: [Windows] Process username(): memory leak in case exception is thrown.
+- 1050_: [Windows] Process.memory_maps memory() leaks memory.
*2017-04-10*
diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
index 69d1fdfd..20d20b82 100644
--- a/psutil/_psutil_windows.c
+++ b/psutil/_psutil_windows.c
@@ -2920,6 +2920,7 @@ psutil_proc_memory_maps(PyObject *self, PyObject *args) {
if (PyList_Append(py_retlist, py_tuple))
goto error;
Py_DECREF(py_tuple);
+ Py_DECREF(py_str);
}
previousAllocationBase = basicInfo.AllocationBase;
baseAddress = (PCHAR)baseAddress + basicInfo.RegionSize;