diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-08 18:50:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-08 18:50:14 (GMT) |
| commit | fe34611d8ec24bd6dd816cf00fa8ac15355bde79 (patch) | |
| tree | 2e4539fae08460369a04d0322a1701140ce16474 /win/tclWinFCmd.c | |
| parent | a51d80f377b33a38caf0a483b4b12bd494698f7f (diff) | |
| parent | ee49fa81d90d8396e545d07c2f5a40a48130a9dc (diff) | |
| download | tcl-fe34611d8ec24bd6dd816cf00fa8ac15355bde79.zip tcl-fe34611d8ec24bd6dd816cf00fa8ac15355bde79.tar.gz tcl-fe34611d8ec24bd6dd816cf00fa8ac15355bde79.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win/tclWinFCmd.c')
| -rw-r--r-- | win/tclWinFCmd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index a69dbe5..c3ced34 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -337,7 +337,7 @@ DoRenameFile( * character is either end-of-string or a directory separator */ - if ((strncmp(src, dst, (size_t) Tcl_DStringLength(&srcString))==0) + if ((strncmp(src, dst, Tcl_DStringLength(&srcString))==0) && (dst[Tcl_DStringLength(&srcString)] == '\\' || dst[Tcl_DStringLength(&srcString)] == '/' || dst[Tcl_DStringLength(&srcString)] == '\0')) { @@ -1649,7 +1649,6 @@ ConvertFileNameFormat( * likely to lead to infinite loops. */ - Tcl_DStringInit(&ds); tempString = TclGetString(tempPath); nativeName = Tcl_WinUtfToTChar(tempString, tempPath->length, &ds); Tcl_DecrRefCount(tempPath); |
