summaryrefslogtreecommitdiffstats
path: root/generic/tclStringRep.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-10 11:33:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-10 11:33:25 (GMT)
commit06d15abf35fabff20dcd2f953f3c52ed6d9bd7ce (patch)
tree8618aca4a3bc042191de3d1e3e277eeed60ba5e1 /generic/tclStringRep.h
parent0e0be8492f32e304665caeadace916ce72829c5e (diff)
parent2592b1e93b713440a2fab51b01df4ad31bb21f7d (diff)
downloadtcl-06d15abf35fabff20dcd2f953f3c52ed6d9bd7ce.zip
tcl-06d15abf35fabff20dcd2f953f3c52ed6d9bd7ce.tar.gz
tcl-06d15abf35fabff20dcd2f953f3c52ed6d9bd7ce.tar.bz2
Merge 8.6
Diffstat (limited to 'generic/tclStringRep.h')
-rw-r--r--generic/tclStringRep.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index fc5a713..1ad78a1 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -65,9 +65,9 @@ typedef struct {
} String;
#define STRING_MAXCHARS \
- (int)(((size_t)UINT_MAX - sizeof(String))/sizeof(Tcl_UniChar))
+ (int)(((size_t)UINT_MAX - 1 - offsetof(String, unicode))/sizeof(Tcl_UniChar))
#define STRING_SIZE(numChars) \
- (sizeof(String) + ((numChars) * sizeof(Tcl_UniChar)))
+ (offsetof(String, unicode) + ((numChars + 1) * sizeof(Tcl_UniChar)))
#define stringCheckLimits(numChars) \
do { \
if ((numChars) < 0 || (numChars) > STRING_MAXCHARS) { \