diff options
| author | mig <mig> | 2011-04-13 13:23:45 (GMT) |
|---|---|---|
| committer | mig <mig> | 2011-04-13 13:23:45 (GMT) |
| commit | 1c28a4ad0359711950277af2f24dca1a1b7cd041 (patch) | |
| tree | 087fd57082e97a3b84c1692414ad125c0ae45994 /generic/tclVar.c | |
| parent | 4884764d1d8d9cf7bd61e25622b0173c43e46114 (diff) | |
| parent | ff0738ff2d537d9c4d0d95d944bfd0a239baef8e (diff) | |
| download | tcl-1c28a4ad0359711950277af2f24dca1a1b7cd041.zip tcl-1c28a4ad0359711950277af2f24dca1a1b7cd041.tar.gz tcl-1c28a4ad0359711950277af2f24dca1a1b7cd041.tar.bz2 | |
fix for [Bug 2662380], crash caused by appending to a variable with a write trace that unsets it
Diffstat (limited to 'generic/tclVar.c')
| -rw-r--r-- | generic/tclVar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index 28151c0..b735ba3 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -2670,13 +2670,14 @@ Tcl_AppendObjCmd( /* * Note that we do not need to increase the refCount of the Var * pointers: should a trace delete the variable, the return value - * of TclPtrSetVar will be NULL, and we will not access the - * variable again. + * of TclPtrSetVar will be NULL or emptyObjPtr, and we will not + * access the variable again. */ varValuePtr = TclPtrSetVar(interp, varPtr, arrayPtr, objv[1], NULL, objv[i], TCL_APPEND_VALUE|TCL_LEAVE_ERR_MSG, -1); - if (varValuePtr == NULL) { + if ((varValuePtr == NULL) || + (varValuePtr == ((Interp *) interp)->emptyObjPtr)) { return TCL_ERROR; } } |