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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index f13310152b55726124ab4b71bd9adcf38890c6f7..47dac374ed5fa3454a275bf99f00f4547ad41afd 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,6 +80,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 c1060f6d4cb9896d5b940c18d2331c3da81ff5ed..d13690d360afa971bea6b1832747d6dffe6dfe1e 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1256,7 +1256,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);