From 2b8debfc7c240324d89abf992a13519b0c274c9f Mon Sep 17 00:00:00 2001 From: Guilherme Polo Date: Fri, 6 Feb 2009 23:30:11 +0000 Subject: [PATCH] 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. --- Misc/NEWS | 4 ++++ Modules/_tkinter.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 492e0c5db30d..cc811dc39ca0 100644 --- 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 eed7177731e5..9b417b4ff050 100644 --- 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); -- 2.47.3