Deallocate content of the dict free list on interpreter shutdown

christian.heimes · christian.heimes · commit 7613272853a6 · 2008-02-08T00:11:31.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@60661 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
@@ -130,6 +130,7 @@ PyAPI_FUNC(void) _PyImport_Fini(void);
 PyAPI_FUNC(void) PyMethod_Fini(void);
 PyAPI_FUNC(void) PyFrame_Fini(void);
 PyAPI_FUNC(void) PyCFunction_Fini(void);
+PyAPI_FUNC(void) PyDict_Fini(void);
 PyAPI_FUNC(void) PyTuple_Fini(void);
 PyAPI_FUNC(void) PyList_Fini(void);
 PyAPI_FUNC(void) PySet_Fini(void);
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 1?
 Core and builtins
 -----------------
 
+- Fixed a minor memory leak in dictobject.c. The content of the free
+  list was not freed on interpreter shutdown.
+
 - Limit free list of method and builtin function objects to 256 entries
   each.
 
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -205,6 +205,18 @@ show_alloc(void)
 static PyDictObject *free_list[PyDict_MAXFREELIST];
 static int numfree = 0;
 
+void
+PyDict_Fini(void)
+{
+	PyListObject *op;
+
+	while (numfree) {
+		op = free_list[numfree--];
+		assert(PyDict_CheckExact(op));
+		PyObject_GC_Del(op);
+	}
+}
+
 PyObject *
 PyDict_New(void)
 {
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -473,6 +473,7 @@ Py_Finalize(void)
 	PyString_Fini();
 	PyInt_Fini();
 	PyFloat_Fini();
+	PyDict_Fini();
 
 #ifdef Py_USING_UNICODE
 	/* Cleanup Unicode implementation */
