summaryrefslogtreecommitdiffstats
path: root/generic/tclStringObj.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-02-09 15:00:46 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-02-09 15:00:46 (GMT)
commit1282ebeb8db26665851fd4aad9c31e0d2e7bd7e0 (patch)
tree62b0ddf0cdb20a546d439a7a60a4f5853f9c8871 /generic/tclStringObj.c
parentb0b7c57736c4ec1e0cbb46da278f135136395019 (diff)
parent7695d3270788d56c1ba433909285dcab42414edb (diff)
downloadtcl-1282ebeb8db26665851fd4aad9c31e0d2e7bd7e0.zip
tcl-1282ebeb8db26665851fd4aad9c31e0d2e7bd7e0.tar.gz
tcl-1282ebeb8db26665851fd4aad9c31e0d2e7bd7e0.tar.bz2
3484402 Correct Off-By-One error appending unicode. Thanks to Poor Yorick.
Also corrected test for when growth is needed.
Diffstat (limited to 'generic/tclStringObj.c')
-rw-r--r--generic/tclStringObj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 13dda54..3f243a6 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -1379,7 +1379,7 @@ AppendUnicodeToUnicodeRep(
numChars = stringPtr->numChars + appendNumChars;
stringCheckLimits(numChars);
- if (STRING_UALLOC(numChars) >= stringPtr->uallocated) {
+ if (STRING_UALLOC(numChars) > stringPtr->uallocated) {
/*
* Protect against case where unicode points into the existing
* stringPtr->unicode array. Force it to follow any relocations
@@ -1387,7 +1387,7 @@ AppendUnicodeToUnicodeRep(
*/
int offset = -1;
if (unicode >= stringPtr->unicode && unicode <= stringPtr->unicode
- + 1 + stringPtr->uallocated / sizeof(Tcl_UniChar)) {
+ + stringPtr->uallocated / sizeof(Tcl_UniChar)) {
offset = unicode - stringPtr->unicode;
}