diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-08 11:32:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-08 11:32:07 (GMT) |
| commit | 765d72ec87913a40767db9ae1132908ae3ee668f (patch) | |
| tree | f0e734670d5a0e7c3a9c2a8b10e9f7867ea9d7f0 /generic | |
| parent | 6930965bd3e38495b0b2993395084c7e6f666c92 (diff) | |
| parent | 83920326ba5851cad594e6a261205a202b75a338 (diff) | |
| download | tk-765d72ec87913a40767db9ae1132908ae3ee668f.zip tk-765d72ec87913a40767db9ae1132908ae3ee668f.tar.gz tk-765d72ec87913a40767db9ae1132908ae3ee668f.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkSelect.c | 4 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkSelect.c b/generic/tkSelect.c index ab9018a..d763411 100644 --- a/generic/tkSelect.c +++ b/generic/tkSelect.c @@ -190,8 +190,8 @@ Tk_CreateSelHandler( * should make a copy for this selPtr. */ - unsigned cmdInfoLen = Tk_Offset(CommandInfo, command) + - ((CommandInfo *)clientData)->cmdLength + 1; + unsigned cmdInfoLen = Tk_Offset(CommandInfo, command) + 1 + + ((CommandInfo *)clientData)->cmdLength; selPtr->clientData = ckalloc(cmdInfoLen); memcpy(selPtr->clientData, clientData, cmdInfoLen); diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 371e910..03d11e1 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; } |