summaryrefslogtreecommitdiffstats
path: root/generic/tclStringObj.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2010-03-29 21:57:33 (GMT)
committerdgp <dgp@users.sourceforge.net>2010-03-29 21:57:33 (GMT)
commit9ef227372e59919e9aadd784fbf922027cb6289b (patch)
tree797731259de846223c51b5e5170468b9964f4098 /generic/tclStringObj.c
parent3c90840fbff766b8e5eba6584f1dfbe00dadd91b (diff)
downloadtcl-9ef227372e59919e9aadd784fbf922027cb6289b.zip
tcl-9ef227372e59919e9aadd784fbf922027cb6289b.tar.gz
tcl-9ef227372e59919e9aadd784fbf922027cb6289b.tar.bz2
* generic/tclStringObj.c: Fix array overrun in test format-1.12
caught by valgrind testing.
Diffstat (limited to 'generic/tclStringObj.c')
-rw-r--r--generic/tclStringObj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index ffa51f8..ab6a600 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -33,7 +33,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.19 2010/01/18 09:50:57 dkf Exp $ */
+ * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.20 2010/03/29 21:57:33 dgp Exp $ */
#include "tclInt.h"
#include "tommath.h"
@@ -2275,7 +2275,7 @@ Tcl_AppendFormatToObj(
int digitOffset;
if (useBig && big.used) {
- if ((size_t) shift <
+ if (index < big.used && (size_t) shift <
CHAR_BIT*sizeof(Tcl_WideUInt) - DIGIT_BIT) {
bits |= (((Tcl_WideUInt)big.dp[index++]) <<shift);
shift += DIGIT_BIT;