diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2005-10-29 19:16:32 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2005-10-29 19:16:32 (GMT) |
| commit | e4937d5509607c42d8ca01d05763d87e8b3e43ce (patch) | |
| tree | ad0e330970d975778094123140c4149e361438bb /generic | |
| parent | 4b9135a520fdab05e275330093a65b2e1d957438 (diff) | |
| download | tcl-e4937d5509607c42d8ca01d05763d87e8b3e43ce.zip tcl-e4937d5509607c42d8ca01d05763d87e8b3e43ce.tar.gz tcl-e4937d5509607c42d8ca01d05763d87e8b3e43ce.tar.bz2 | |
* generic/tclTrace.c (TraceVarProc): [Bug 1337229], partial
fix. Insure that a second call with TCL_TRACE_DESTROYED does not
lead to a second call to Tcl_EventuallyFree(). It is still true
that that second call should not happen, so the bug is not
completely fixed.
* tests/trace.test (test-18.3-4): added tests for bugs #1337229
and 1338280.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclTrace.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclTrace.c b/generic/tclTrace.c index 9d7ab86..6976a06 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTrace.c,v 1.26 2005/07/23 00:04:31 dkf Exp $ + * RCS: @(#) $Id: tclTrace.c,v 1.27 2005/10/29 19:16:32 msofer Exp $ */ #include "tclInt.h" @@ -1915,7 +1915,7 @@ TraceVarProc(clientData, interp, name1, name2, flags) { TraceVarInfo *tvarPtr = (TraceVarInfo *) clientData; char *result; - int code; + int code, destroy = 0; Tcl_DString cmd; /* @@ -1975,7 +1975,9 @@ TraceVarProc(clientData, interp, name1, name2, flags) * double-free might occur depending on what the eval does. */ - if (flags & TCL_TRACE_DESTROYED) { + if ((flags & TCL_TRACE_DESTROYED) + && !(tvarPtr->flags & TCL_TRACE_DESTROYED)) { + destroy = 1; tvarPtr->flags |= TCL_TRACE_DESTROYED; } code = Tcl_EvalEx(interp, Tcl_DStringValue(&cmd), @@ -1988,7 +1990,7 @@ TraceVarProc(clientData, interp, name1, name2, flags) Tcl_DStringFree(&cmd); } } - if (flags & TCL_TRACE_DESTROYED) { + if (destroy) { if (result != NULL) { register Tcl_Obj *errMsgObj = (Tcl_Obj *) result; |