summaryrefslogtreecommitdiffstats
path: root/generic/tkTextDisp.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-08 11:20:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-08 11:20:54 (GMT)
commit8d608dd1a21c704661639fd8d43af18fec414d0f (patch)
treef9fabdba09b2efd8fa849595ba52afd4b43194a4 /generic/tkTextDisp.c
parent4b8bb9766c83c93000160b5aeb3723d90dd95926 (diff)
parent83920326ba5851cad594e6a261205a202b75a338 (diff)
downloadtk-8d608dd1a21c704661639fd8d43af18fec414d0f.zip
tk-8d608dd1a21c704661639fd8d43af18fec414d0f.tar.gz
tk-8d608dd1a21c704661639fd8d43af18fec414d0f.tar.bz2
merge core-8-6-branch
Diffstat (limited to 'generic/tkTextDisp.c')
-rw-r--r--generic/tkTextDisp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 0958986..c04027d 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -7561,7 +7561,7 @@ TkTextCharLayoutProc(
ciPtr = &bciPtr->ci;
} else {
bciPtr = baseCharChunkPtr->clientData;
- ciPtr = ckalloc(sizeof(CharInfo));
+ ciPtr = ckalloc(Tk_Offset(CharInfo, chars) + 1);
baseString = &bciPtr->baseChars;
}