diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-28 23:44:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-28 23:44:33 (GMT) |
| commit | 8b03ef0b29d52146cae3414edb12216bcc61feeb (patch) | |
| tree | 39d60f75eb717fa93a1571cf2eec5cf397bf4699 /generic/tclVar.c | |
| parent | 8f6442b0c910bb7b7431c390a2dbb92985d83162 (diff) | |
| parent | 71b0ad990caaf6a297049da2c63821a4e29c57ac (diff) | |
| download | tcl-8b03ef0b29d52146cae3414edb12216bcc61feeb.zip tcl-8b03ef0b29d52146cae3414edb12216bcc61feeb.tar.gz tcl-8b03ef0b29d52146cae3414edb12216bcc61feeb.tar.bz2 | |
Merge 8.7
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 6226e1e..f7ec7c8 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -4042,8 +4042,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; } @@ -4056,6 +4055,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 |