summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-12 08:57:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-12 08:57:19 (GMT)
commit0feebd2bb96d0045ad6b67352539c022d2f148da (patch)
treef9967fad240854ac13343d41318f89212d96990c
parent45579f0759ba1e425bc28acb698f1649c6552166 (diff)
downloadtk-0feebd2bb96d0045ad6b67352539c022d2f148da.zip
tk-0feebd2bb96d0045ad6b67352539c022d2f148da.tar.gz
tk-0feebd2bb96d0045ad6b67352539c022d2f148da.tar.bz2
Revert [f38091d0]: If TK_LAYOUT_WITH_BASE_CHUNKS is set (MacOSX), this change leads to crash, struct CharInfo is defined differently depending on TK_LAYOUT_WITH_BASE_CHUNKS (however strange that is ...)
-rw-r--r--generic/tkTextDisp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 03d11e1..371e910 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -7561,7 +7561,7 @@ TkTextCharLayoutProc(
ciPtr = &bciPtr->ci;
} else {
bciPtr = baseCharChunkPtr->clientData;
- ciPtr = ckalloc(Tk_Offset(CharInfo, chars) + 1);
+ ciPtr = ckalloc(sizeof(CharInfo));
baseString = &bciPtr->baseChars;
}