summaryrefslogtreecommitdiffstats
path: root/generic/tkTextDisp.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2011-01-25 08:49:59 (GMT)
committernijtmans <nijtmans>2011-01-25 08:49:59 (GMT)
commitd9f56d2b769b4cfce39f195178c30a407de8cccb (patch)
tree05ebd64c7a56b5c6c3ba5b75b9e88c284d137a77 /generic/tkTextDisp.c
parent31f8fbbd1d658b3474895271c7c3525112097d7e (diff)
downloadtk-d9f56d2b769b4cfce39f195178c30a407de8cccb.zip
tk-d9f56d2b769b4cfce39f195178c30a407de8cccb.tar.gz
tk-d9f56d2b769b4cfce39f195178c30a407de8cccb.tar.bz2
[Patch #3129527]: Fix buffer overflow w/ GCC 4.5 and -D_FORTIFY_SOURCE=2.
Just the strcpy->memcpy part, to prevent anything like [Bug #3164879]
Diffstat (limited to 'generic/tkTextDisp.c')
-rw-r--r--generic/tkTextDisp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 48897bd..e16bace 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkTextDisp.c,v 1.14.2.5 2007/04/29 02:24:02 das Exp $
+ * RCS: @(#) $Id: tkTextDisp.c,v 1.14.2.6 2011/01/25 08:49:59 nijtmans Exp $
*/
#include "tkPort.h"
@@ -4586,7 +4586,7 @@ TkTextCharLayoutProc(textPtr, indexPtr, segPtr, byteOffset, maxX, maxBytes,
(sizeof(CharInfo) - 3 + bytesThatFit));
chunkPtr->clientData = (ClientData) ciPtr;
ciPtr->numBytes = bytesThatFit;
- strncpy(ciPtr->chars, p, (size_t) bytesThatFit);
+ memcpy(ciPtr->chars, p, (size_t) bytesThatFit);
if (p[bytesThatFit - 1] == '\n') {
ciPtr->numBytes--;
}