summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2018-04-19 01:41:13 (GMT)
committerdgp <dgp@users.sourceforge.net>2018-04-19 01:41:13 (GMT)
commit7ac6487eda8815506081d820e38c4d364c388b5e (patch)
tree79ec0c157da4e7cf2e49081368882d91713ca0c1 /generic
parent8d0340e39e077c5577acacc1a175b5c412c8905b (diff)
parentdf94eecf119611a2fa8de1abb3abe59269be7550 (diff)
downloadtcl-7ac6487eda8815506081d820e38c4d364c388b5e.zip
tcl-7ac6487eda8815506081d820e38c4d364c388b5e.tar.gz
tcl-7ac6487eda8815506081d820e38c4d364c388b5e.tar.bz2
merge 8.5
Diffstat (limited to 'generic')
-rw-r--r--generic/tclVar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 92ae183..84f2d7b 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3016,7 +3016,7 @@ TclArraySet(
* Install the contents of the dictionary or list into the array.
*/
- if (arrayElemObj->typePtr == &tclDictType) {
+ if (arrayElemObj->typePtr == &tclDictType && arrayElemObj->bytes == NULL) {
Tcl_Obj *keyPtr, *valuePtr;
Tcl_DictSearch search;
int done;