diff options
author | dgp <dgp@users.sourceforge.net> | 2011-06-17 18:24:24 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2011-06-17 18:24:24 (GMT) |
commit | 1fe70fb2d6b530dd2c12c5e5eb5e8d7bac9ec4b2 (patch) | |
tree | bbecfbfdd2691945d9c5d74393caacff1e883912 /generic | |
parent | fbcd87e044a689ee654c0848842691e3c871730d (diff) | |
parent | d96f0a1840e687316f7fb0d8153862a1ae684240 (diff) | |
download | tk-1fe70fb2d6b530dd2c12c5e5eb5e8d7bac9ec4b2.zip tk-1fe70fb2d6b530dd2c12c5e5eb5e8d7bac9ec4b2.tar.gz tk-1fe70fb2d6b530dd2c12c5e5eb5e8d7bac9ec4b2.tar.bz2 |
Crash in unset traces 3062331
Diffstat (limited to 'generic')
-rw-r--r-- | generic/ttk/ttkTrace.c | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/generic/ttk/ttkTrace.c b/generic/ttk/ttkTrace.c index 0128a1d..f171f3d 100644 --- a/generic/ttk/ttkTrace.c +++ b/generic/ttk/ttkTrace.c @@ -44,6 +44,16 @@ VarTraceProc( * If the variable is being unset, then re-establish the trace: */ if (flags & TCL_TRACE_DESTROYED) { + /* + * If a prior call to Ttk_UntraceVariable() left behind an + * indicator that we wanted this handler to be deleted (see below), + * cleanup the ClientData bits and exit. + */ + if (tracePtr->interp == NULL) { + Tcl_DecrRefCount(tracePtr->varnameObj); + ckfree((ClientData)tracePtr); + return NULL; + } Tcl_TraceVar(interp, name, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, VarTraceProc, clientData); @@ -104,6 +114,42 @@ Ttk_TraceHandle *Ttk_TraceVariable( void Ttk_UntraceVariable(Ttk_TraceHandle *h) { if (h) { + ClientData cd = NULL; + + /* + * Workaround for Tcl Bug 3062331. The trace design problem is + * that when variable unset traces fire, Tcl documents that the + * traced variable has already been unset. It's already gone. + * So from within an unset trace, if you try to call + * Tcl_UntraceVar() on that variable, it will do nothing, because + * the variable by that name can no longer be found. It's gone. + * This means callers of Tcl_UntraceVar() that might be running + * in response to an unset trace have to handle the possibility + * that their Tcl_UntraceVar() call will do nothing. In this case, + * we have to support the possibility that Tcl_UntraceVar() will + * leave the trace in place, so we need to leave the ClientData + * untouched so when that trace does fire it will not crash. + */ + + /* + * Search the traces on the variable to see if the one we are tasked + * with removing is present. + */ + while ((cd = Tcl_VarTraceInfo(h->interp, Tcl_GetString(h->varnameObj), + 0, VarTraceProc, cd)) != NULL) { + if (cd == (ClientData) h) { + break; + } + } + /* + * If the trace we wish to delete is not visible, Tcl_UntraceVar + * will do nothing, so don't try to call it. Instead set an + * indicator in the Ttk_TraceHandle that we need to cleanup later. + */ + if (cd == NULL) { + h->interp = NULL; + return; + } Tcl_UntraceVar(h->interp, Tcl_GetString(h->varnameObj), TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, VarTraceProc, (ClientData)h); |