-- Bugfix #3186: Fix memory leaks caused by multiple calls to

   PyDict_SetItemString() with objects that were not properly decrefed
   afterwards.  Due to the number of places this was used, I added a
   wrapper EXPP_dict_set_item_str() to gen_utils.c to handle it.

   This started as a scriptlink bug, due to how many times scripts were
   being executed I think it just magnified how bad the memory leak in
   BPy was.  Animating the blend attached with this bug report would cause
   memory to grow by about 3MB for every 280 frames.  After the patch,
   memory did not appear to grow at all (or at least not noticably using
   Unix's ps and top utils).

   Since many of the PyDict_SetItemString() calls were in initialization
   modules I think my tests executed most of the changed code, but would
   appreciate script users really giving feedback.

1 files changed, 2 insertions, 6 deletions

diff --git a/source/blender/src/pub/license_key.c b/source/blender/src/pub/license_key.c
index 72977e591b4..07e8296a185 100644
--- a/source/blender/src/pub/license_key.c
+++ b/source/blender/src/pub/license_key.c
@@ -234,8 +234,7 @@ static void insertname(PyObject *m,PyObject *p, char *name)
 {
 	PyObject *d = PyModule_GetDict(m);
 
-	PyDict_SetItemString(d, name, p);
-	Py_DECREF(p);
+	EXPP_dict_set_item_str(d, name, p);
 }
 
 /* initialisation */
@@ -243,8 +242,6 @@ static void initprot()
 {
 	PyObject *m, *d;
 	PyObject *capi1;
-	PyObject *ErrorObject;
-
 	init_ftable(); 
 
 	g_main = PyImport_AddModule("__main__");
@@ -254,8 +251,7 @@ static void initprot()
 		(PyObject*)NULL,PYTHON_API_VERSION);
 	g_module_self = m;	
 	d = PyModule_GetDict(m);
-	ErrorObject = PyString_FromString("prot.error");
-	PyDict_SetItemString(d, "error", ErrorObject);
+	EXPP_dict_set_item_str(d, "error", PyString_FromString("prot.error");
 
 	/* add global object */