[Python-checkins] r69378 - in python/branches/release26-maint: Misc/NEWS Modules/_tkinter.c

[guilherme.polo]

Author: guilherme.polo
Date: Fri Feb  6 23:52:31 2009
New Revision: 69378

Log:
Merged revisions 69376 via svnmerge from 
svn+ssh://pythondev/python/trunk

........
  r69376 | guilherme.polo | 2009-02-06 20:26:22 -0200 (Fri, 06 Feb 2009) | 3 lines
  
  Partial fix to issue #1731706: memory leak in Tkapp_Call when calling
  from a thread different than the one that created the Tcl interpreter.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/_tkinter.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri Feb  6 23:52:31 2009
@@ -80,6 +80,10 @@
 Library
 -------
 
+- Partial fix to issue #1731706: memory leak in Tkapp_Call when calling
+  from a thread different than the one that created the Tcl interpreter.
+  Patch by Robert Hancock.
+
 - Issue #5132: Fixed trouble building extensions under Solaris with 
   --enabled-shared activated. Initial patch by Dave Peterson.
 

Modified: python/branches/release26-maint/Modules/_tkinter.c
==============================================================================
--- python/branches/release26-maint/Modules/_tkinter.c	(original)
+++ python/branches/release26-maint/Modules/_tkinter.c	Fri Feb  6 23:52:31 2009
@@ -1256,7 +1256,9 @@
 		*(e->res) = Tkapp_CallResult(e->self);
 	}
 	LEAVE_PYTHON
-  done:
+
+	Tkapp_CallDeallocArgs(objv, objStore, objc);
+done:
 	/* Wake up calling thread. */
 	Tcl_MutexLock(&call_mutex);
 	Tcl_ConditionNotify(&e->done);