summaryrefslogtreecommitdiffstats
path: root/generic/tclUtil.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2021-04-14 19:19:44 (GMT)
committerdgp <dgp@users.sourceforge.net>2021-04-14 19:19:44 (GMT)
commitfc702f65d29664d061ea6691971436e059e4d8bc (patch)
treed131dc88c6705bc8062ad2fd70fafd13d48dd8f2 /generic/tclUtil.c
parentccfe3f47fd0a170a819d29e0b22bba0003546796 (diff)
parent9cb33ddcc542ff8855a3892170d61ec1375567e4 (diff)
downloadtcl-fc702f65d29664d061ea6691971436e059e4d8bc.zip
tcl-fc702f65d29664d061ea6691971436e059e4d8bc.tar.gz
tcl-fc702f65d29664d061ea6691971436e059e4d8bc.tar.bz2
merge 8.6
Diffstat (limited to 'generic/tclUtil.c')
-rw-r--r--generic/tclUtil.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index d5ec040..bbacbe2 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -2030,7 +2030,14 @@ Tcl_ConcatObj(
continue;
}
if (resPtr) {
- if (TCL_OK != Tcl_ListObjAppendList(NULL, resPtr, objPtr)) {
+ Tcl_Obj *elemPtr = NULL;
+
+ Tcl_ListObjIndex(NULL, objPtr, 0, &elemPtr);
+ if (elemPtr == NULL) {
+ continue;
+ }
+ if (Tcl_GetString(elemPtr)[0] == '#' || TCL_OK
+ != Tcl_ListObjAppendList(NULL, resPtr, objPtr)) {
/* Abandon ship! */
Tcl_DecrRefCount(resPtr);
goto slow;