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.

1 files changed, 10 insertions, 4 deletions

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 2e2aa60..9a134f9 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -230,6 +230,9 @@ Tcl_WinUtfToTChar(
     Tcl_DString *dsPtr)
 {
     Tcl_DStringInit(dsPtr);
+    if (!string) {
+	return NULL;
+    }
     return (char *)Tcl_UtfToUniCharDString(string, len, dsPtr);
 }
 
@@ -239,12 +242,15 @@ Tcl_WinTCharToUtf(
     int len,
     Tcl_DString *dsPtr)
 {
-    if (len > 0) {
-	len /= 2;
-    } else if (len == -1) {
+    Tcl_DStringInit(dsPtr);
+    if (!string) {
+	return NULL;
+    }
+    if (len < 0) {
 	len = wcslen((wchar_t *)string);
+    } else {
+	len /= 2;
     }
-    Tcl_DStringInit(dsPtr);
     return Tcl_UniCharToUtfDString((Tcl_UniChar *)string, len, dsPtr);
 }