diff options
| author | dgp <dgp@noemail.net> | 2007-03-13 15:59:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2007-03-13 15:59:50 (GMT) |
| commit | b95476021cddcca3ca84dc5ca935553fa0661d0e (patch) | |
| tree | 4d389b4a06d153cf1f155302bf79074e9fe3ee43 /generic | |
| parent | b8e60244e87841746ecb1976ad4711b919eeb541 (diff) | |
| download | tcl-b95476021cddcca3ca84dc5ca935553fa0661d0e.zip tcl-b95476021cddcca3ca84dc5ca935553fa0661d0e.tar.gz tcl-b95476021cddcca3ca84dc5ca935553fa0661d0e.tar.bz2 | |
* generic/tclVar.c (TclArraySet): Re-fetch pointers for the list
* tests/var.test (var-17.1): argument of [array set] each time
through the loop as defense against possible shimmer issues.
[Bug 1669489].
FossilOrigin-Name: d5a61fe6c13f537abdaa84d535aebd756f541110
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclVar.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index c0dfdc3..b8c608b 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclVar.c,v 1.69.2.12 2006/10/05 11:44:03 msofer Exp $ + * RCS: @(#) $Id: tclVar.c,v 1.69.2.13 2007/03/13 15:59:52 dgp Exp $ */ #include "tclInt.h" @@ -3489,6 +3489,14 @@ TclArraySet(interp, arrayNameObj, arrayElemObj) result = TCL_ERROR; break; } + + /* + * The TclPtrSetVar call might have shimmered + * arrayElemObj to another type, so re-fetch + * the pointers for safety. + */ + Tcl_ListObjGetElements(NULL, arrayElemObj, + &elemLen, &elemPtrs); } return result; } |