diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-01 08:47:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-01 08:47:57 (GMT) |
| commit | da02e63f0ab94d965d72f687788adf41de420957 (patch) | |
| tree | 2777253542c057852616cdbdfe6c3261ded7baf8 /generic/tclPathObj.c | |
| parent | 76e8da363bc1d0cdfad2b3d1a3e0f8024ff09da1 (diff) | |
| parent | 799554b1c55435a6c7cc1f4529d3e468106b9091 (diff) | |
| download | tcl-da02e63f0ab94d965d72f687788adf41de420957.zip tcl-da02e63f0ab94d965d72f687788adf41de420957.tar.gz tcl-da02e63f0ab94d965d72f687788adf41de420957.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 93e6614..8db9aeb 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -948,6 +948,7 @@ TclJoinPath( } } strElt = TclGetStringFromObj(elt, &strEltLen); + driveNameLength = 0; type = TclGetPathType(elt, &fsPtr, &driveNameLength, &driveName); if (type != TCL_PATH_RELATIVE) { /* @@ -1003,6 +1004,12 @@ TclJoinPath( } } ptr = strElt; + /* [Bug f34cf83dd0] */ + if (driveNameLength > 0) { + if (ptr[0] == '/' && ptr[-1] == '/') { + goto noQuickReturn; + } + } while (*ptr != '\0') { if (*ptr == '/' && (ptr[1] == '/' || ptr[1] == '\0')) { /* |