diff options
| author | Guilherme Polo <ggpolo@gmail.com> | 2009-02-06 22:52:31 (GMT) |
|---|---|---|
| committer | Guilherme Polo <ggpolo@gmail.com> | 2009-02-06 22:52:31 (GMT) |
| commit | c8a20daa126158f155ebd0b6b801d52623f5632f (patch) | |
| tree | d94c5f119910e794518dfd046942fa334159870e | |
| parent | 5ef3fdc067f922912bfd86ccfdb2da48e2df73a7 (diff) | |
| download | cpython-c8a20daa126158f155ebd0b6b801d52623f5632f.zip cpython-c8a20daa126158f155ebd0b6b801d52623f5632f.tar.gz cpython-c8a20daa126158f155ebd0b6b801d52623f5632f.tar.bz2 | |
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.
........
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/_tkinter.c | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -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 c1060f6..d13690d 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); |