Streamline: Tcl_WinTCharToUtf/Tcl_WinUtfToTChar(): Always initialize DString, and let it return NULL when imput is NULL. That's what seem to assume the callers.

1 files changed, 10 insertions, 4 deletions

diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index ca1c856..6fc2401 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -548,6 +548,9 @@ Tcl_WinUtfToTChar(
 				 * converted string is stored. */
 {
     Tcl_DStringInit(dsPtr);
+    if (!string) {
+	return NULL;
+    }
     return Tcl_UtfToUniCharDString(string, len, dsPtr);
 }
 
@@ -559,12 +562,15 @@ Tcl_WinTCharToUtf(
     Tcl_DString *dsPtr)		/* Uninitialized or free DString in which the
 				 * converted string is stored. */
 {
-    if (len > 0) {
-	len /= 2;
-    } else if (len < 0) {
+    Tcl_DStringInit(dsPtr);
+    if (!string) {
+	return NULL;
+    }
+    if (len < 0) {
 	len = wcslen(string);
+    } else {
+	len /= 2;
     }
-    Tcl_DStringInit(dsPtr);
     return Tcl_UniCharToUtfDString(string, len, dsPtr);
 }