summaryrefslogtreecommitdiffstats
path: root/generic/tclEncoding.c
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2015-05-17 19:49:44 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2015-05-17 19:49:44 (GMT)
commitcfa827e791d953ccbd7175241f83f474fe11e86c (patch)
tree2905f9e58003ed85727b6c497ff9b87b5b09d37b /generic/tclEncoding.c
parent7dd3032cdff120e7a4ad166748e31b3148d875b9 (diff)
parent3af5a880588f8973a7dba1d9a41a481d5a447a60 (diff)
downloadtcl-cfa827e791d953ccbd7175241f83f474fe11e86c.zip
tcl-cfa827e791d953ccbd7175241f83f474fe11e86c.tar.gz
tcl-cfa827e791d953ccbd7175241f83f474fe11e86c.tar.bz2
Merge updates from trunk.
Diffstat (limited to 'generic/tclEncoding.c')
-rw-r--r--generic/tclEncoding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 179ca17..a7ef199 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2334,7 +2334,7 @@ UtfToUtfProc(
*dst++ = *src++;
} else if (pureNullMode == 1 && UCHAR(*src) == 0xc0 &&
- UCHAR(*(src+1)) == 0x80) {
+ (src + 1 < srcEnd) && UCHAR(*(src+1)) == 0x80) {
/*
* Convert 0xc080 to real nulls when we are in output mode.
*/