From: Guilherme Polo <ggpolo@gmail.com>
Date: Fri, 6 Feb 2009 22:52:31 +0000 (+0000)
Subject: Merged revisions 69376 via svnmerge from
X-Git-Tag: v2.6.2c1~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8a20daa126158f155ebd0b6b801d52623f5632f;p=thirdparty%2FPython%2Fcpython.git

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 f13310152b55..47dac374ed5f 100644
--- 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 c1060f6d4cb9..d13690d360af 100644
--- 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);