diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-08 18:34:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-08 18:34:09 (GMT) |
| commit | ee49fa81d90d8396e545d07c2f5a40a48130a9dc (patch) | |
| tree | c319f2a6adec30276f52ed3c16da22e1f5498a75 /generic/tclEncoding.c | |
| parent | 3826a26f8a75540c7f3ff0b45f76498e85486dc9 (diff) | |
| parent | cc4dae5c0f418d304a44bb10c87c624b478b6441 (diff) | |
| download | tcl-ee49fa81d90d8396e545d07c2f5a40a48130a9dc.zip tcl-ee49fa81d90d8396e545d07c2f5a40a48130a9dc.tar.gz tcl-ee49fa81d90d8396e545d07c2f5a40a48130a9dc.tar.bz2 | |
Merge 8.6
Also fix startup problems on win32, when the encoding path contains invalid UTF-8 (reported by François Vogel)
Various other code cleanup, e.g. remove empty.zip file, as this didn't work quite as expected.
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index f6744e9..d5e8c9a 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2058,7 +2058,7 @@ LoadEscapeEncoding( dataPtr->numSubTables = Tcl_DStringLength(&escapeData) / sizeof(EscapeSubTable); memcpy(dataPtr->subTables, Tcl_DStringValue(&escapeData), - (size_t) Tcl_DStringLength(&escapeData)); + Tcl_DStringLength(&escapeData)); Tcl_DStringFree(&escapeData); memset(dataPtr->prefixBytes, 0, sizeof(dataPtr->prefixBytes)); |