summaryrefslogtreecommitdiffstats
path: root/generic/tclBinary.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-02 16:04:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-02 16:04:59 (GMT)
commitbfaca509637e46e0ffd48c20a60b78c617c7bf44 (patch)
tree4a8907259172a0e3fb26c1592c5f5a9c9169d90c /generic/tclBinary.c
parentcc3041cee0463eae2d11f0125f3921b66f67497a (diff)
downloadtcl-bfaca509637e46e0ffd48c20a60b78c617c7bf44.zip
tcl-bfaca509637e46e0ffd48c20a60b78c617c7bf44.tar.gz
tcl-bfaca509637e46e0ffd48c20a60b78c617c7bf44.tar.bz2
Backport [bd94500678e837d7] from 8.7, preventing endless loops in UTF-8 conversions when handling surrogates. Only effective when compiling with -DTCL_UTF_MAX=4|6 (default: 3). Meant for benefit of Androwish.
Diffstat (limited to 'generic/tclBinary.c')
-rw-r--r--generic/tclBinary.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 2874ea8..d810e84 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -1211,7 +1211,7 @@ BinaryFormatCmd(
badField:
{
Tcl_UniChar ch = 0;
- char buf[TCL_UTF_MAX + 1];
+ char buf[TCL_UTF_MAX + 1] = "";
TclUtfToUniChar(errorString, &ch);
buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
@@ -1581,7 +1581,7 @@ BinaryScanCmd(
badField:
{
Tcl_UniChar ch = 0;
- char buf[TCL_UTF_MAX + 1];
+ char buf[TCL_UTF_MAX + 1] = "";
TclUtfToUniChar(errorString, &ch);
buf[Tcl_UniCharToUtf(ch, buf)] = '\0';