Hand-merged revision 69376 from

svn+ssh://pythondev/python/trunk

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 492e0c5db30d0942f7e8432fb92b658e128a3902..cc811dc39ca0ad25abf3ca9e0ef506aa8132d1ca 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -111,6 +111,10 @@ Core and Builtins
 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.
 

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index eed7177731e54745ec82abe53b2585723bac32d9..9b417b4ff05010fae32bbc2fbabd58a3ba12322b 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1208,7 +1208,9 @@ Tkapp_CallProc(Tkapp_CallEvent *e, int flags)
                *(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);