summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2021-02-20 14:11:19 (GMT)
committerfvogel <fvogelnew1@free.fr>2021-02-20 14:11:19 (GMT)
commita6fcc32ebf1951f7cbe9c686563b962a1a1f72a1 (patch)
treeb03f510da3cd14d5b03a7ee14d9d7fe12a082d78
parent866867dfb7bec2953757d5bf0ca17c930741758c (diff)
downloadtk-a6fcc32ebf1951f7cbe9c686563b962a1a1f72a1.zip
tk-a6fcc32ebf1951f7cbe9c686563b962a1a1f72a1.tar.gz
tk-a6fcc32ebf1951f7cbe9c686563b962a1a1f72a1.tar.bz2
Fix [be9cade996]: sigsegv in tkwait. Propagate the fix from https://core.tcl-lang.org/tcl/tktview/16828b3744521541660af48501fa06e63e564ad3 from vwait to tkwait.
-rw-r--r--generic/tkCmds.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 193c3d6..c5f0a50 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1120,14 +1120,16 @@ Tk_TkwaitObjCmd(
static char *
WaitVariableProc(
ClientData clientData, /* Pointer to integer to set to 1. */
- TCL_UNUSED(Tcl_Interp *), /* Interpreter containing variable. */
- TCL_UNUSED(const char *), /* Name of variable. */
+ Tcl_Interp *interp, /* Interpreter containing variable. */
+ const char *name1, /* Name of variable. */
TCL_UNUSED(const char *), /* Second part of variable name. */
TCL_UNUSED(int)) /* Information about what happened. */
{
int *donePtr = (int *)clientData;
*donePtr = 1;
+ Tcl_UntraceVar(interp, name1, TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ WaitVariableProc, clientData);
return NULL;
}