summaryrefslogtreecommitdiffstats
path: root/generic/tclExecute.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-01-13 13:23:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-01-13 13:23:10 (GMT)
commit8a90d26eafca6f78203e2af6e227e6404041b851 (patch)
tree259e8680d9866f7c345bee0b5c7dc89380f9b942 /generic/tclExecute.c
parent99b53ecd555fc85d8da85b6ca26bd8504e655d88 (diff)
parentbe409f301ed5dff8685300d8f28e0e06711ee22d (diff)
downloadtcl-8a90d26eafca6f78203e2af6e227e6404041b851.zip
tcl-8a90d26eafca6f78203e2af6e227e6404041b851.tar.gz
tcl-8a90d26eafca6f78203e2af6e227e6404041b851.tar.bz2
Merge 8.6
Diffstat (limited to 'generic/tclExecute.c')
-rw-r--r--generic/tclExecute.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index fdcddab..d03f1cb 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5538,7 +5538,9 @@ TEBCresume(
p = ustring1;
end = ustring1 + length;
for (; ustring1 < end; ustring1++) {
- if ((*ustring1 == *ustring2) && (length2==1 ||
+ if ((*ustring1 == *ustring2) &&
+ /* Fix bug [69218ab7b]: restrict max compare length. */
+ (end-ustring1 >= length2) && (length2==1 ||
memcmp(ustring1, ustring2, sizeof(Tcl_UniChar) * length2)
== 0)) {
if (p != ustring1) {