diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-10 13:27:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-10 13:27:58 (GMT) |
| commit | 39813465e8054beeceda75fc30d76c02609bcd83 (patch) | |
| tree | e3e205c31add776c69a2516e3cff3531b713d43b | |
| parent | e5777aad56d50236d7ed1cbbd6798f2073e82ab1 (diff) | |
| parent | 615b18fee4adf12d21c4019aa7b3bc8a96ff2344 (diff) | |
| download | tcl-39813465e8054beeceda75fc30d76c02609bcd83.zip tcl-39813465e8054beeceda75fc30d76c02609bcd83.tar.gz tcl-39813465e8054beeceda75fc30d76c02609bcd83.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclFileName.c | 4 | ||||
| -rw-r--r-- | win/tclWinFile.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 8cbd298..6ef768d 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -242,7 +242,7 @@ ExtractWinRoot( if (path[4] == '\0') { abs = 4; - } else if (path [4] == ':' && path[5] == '\0') { + } else if (path[4] == ':' && path[5] == '\0') { abs = 5; } @@ -264,7 +264,7 @@ ExtractWinRoot( if (path[4] == '\0') { abs = 4; - } else if (path [4] == ':' && path[5] == '\0') { + } else if (path[4] == ':' && path[5] == '\0') { abs = 5; } } diff --git a/win/tclWinFile.c b/win/tclWinFile.c index b1727af..f51d6f5 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -1254,7 +1254,7 @@ WinIsReserved( if (path[4] == '\0') { return 4; - } else if (path [4] == ':' && path[5] == '\0') { + } else if (path[4] == ':' && path[5] == '\0') { return 4; } } else if ((path[2] == 'n' || path[2] == 'N') && path[3] == '\0') { @@ -1275,7 +1275,7 @@ WinIsReserved( if (path[4] == '\0') { return 4; - } else if (path [4] == ':' && path[5] == '\0') { + } else if (path[4] == ':' && path[5] == '\0') { return 4; } } @@ -3117,7 +3117,8 @@ TclNativeCreateNativeRep( goto done; } MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, -1, nativePathPtr, - len + 1); + len + 2); + nativePathPtr[len] = 0; /* * If path starts with "//?/" or "\\?\" (extended path), translate any |