diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-29 09:53:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-29 09:53:43 (GMT) |
| commit | b1ee845c0265f36fbf396a21852282df9f35ad17 (patch) | |
| tree | 46e15f79b9489610565861fff15a96b3eff37a63 /generic/tclVar.c | |
| parent | 64383b33bd0277ac8c9e3218da0b6a39582af7e1 (diff) | |
| parent | 8b03ef0b29d52146cae3414edb12216bcc61feeb (diff) | |
| download | tcl-b1ee845c0265f36fbf396a21852282df9f35ad17.zip tcl-b1ee845c0265f36fbf396a21852282df9f35ad17.tar.gz tcl-b1ee845c0265f36fbf396a21852282df9f35ad17.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclVar.c')
| -rw-r--r-- | generic/tclVar.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index c95e3de..5209f3b 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -4044,8 +4044,7 @@ ArraySetCmd( size_t elemLen; Tcl_Obj **elemPtrs, *copyListObj; - result = TclListObjGetElementsM(interp, arrayElemObj, - &elemLen, &elemPtrs); + result = TclListObjLengthM(interp, arrayElemObj, &elemLen); if (result != TCL_OK) { return result; } @@ -4058,6 +4057,11 @@ ArraySetCmd( if (elemLen == 0) { goto ensureArray; } + result = TclListObjGetElementsM(interp, arrayElemObj, + &elemLen, &elemPtrs); + if (result != TCL_OK) { + return result; + } /* * We needn't worry about traces invalidating arrayPtr: should that be |