summaryrefslogtreecommitdiffstats
path: root/generic/tclStringRep.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-22 19:58:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-22 19:58:02 (GMT)
commitabccdbc60065601867bb37fbaa0313341abc1b7d (patch)
tree1266cd833be1e6e3c6607adbc5773205b64f6dc2 /generic/tclStringRep.h
parentdf95b68753a5b8b52e240d6dd95bd69bce9607af (diff)
parent7b333ba9056bfea7a16de7fa67405a0a9279de14 (diff)
downloadtcl-abccdbc60065601867bb37fbaa0313341abc1b7d.zip
tcl-abccdbc60065601867bb37fbaa0313341abc1b7d.tar.gz
tcl-abccdbc60065601867bb37fbaa0313341abc1b7d.tar.bz2
Merge 8.6
Diffstat (limited to 'generic/tclStringRep.h')
-rw-r--r--generic/tclStringRep.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index 672210a..27c3fc2 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -65,14 +65,14 @@ typedef struct {
} String;
#define STRING_MAXCHARS \
- (int)(((size_t)UINT_MAX - 1 - offsetof(String, unicode))/sizeof(Tcl_UniChar))
+ (int)(((size_t)UINT_MAX - offsetof(String, unicode))/sizeof(Tcl_UniChar) - 1)
#define STRING_SIZE(numChars) \
- (offsetof(String, unicode) + (((numChars) + 1U) * sizeof(Tcl_UniChar)))
+ (offsetof(String, unicode) + sizeof(Tcl_UniChar) + ((numChars) * sizeof(Tcl_UniChar)))
#define stringCheckLimits(numChars) \
do { \
if ((numChars) < 0 || (numChars) > STRING_MAXCHARS) { \
Tcl_Panic("max length for a Tcl unicode value (%d chars) exceeded", \
- (int)STRING_MAXCHARS); \
+ STRING_MAXCHARS); \
} \
} while (0)
#define stringAttemptAlloc(numChars) \