diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-08-20 23:50:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-08-20 23:50:44 (GMT) |
| commit | dbf049c0fba4506927b17c7ff9f7d66aa61cde18 (patch) | |
| tree | 740b650a52897d03d9c3dbd0632fbed19c9e2d31 /generic/tclPathObj.c | |
| parent | eb9bcac9c6ae30bb3e5f6bc298ee8238927a93e1 (diff) | |
| parent | 843b8497d3c972540e5b12b26ae3055d9df4bf77 (diff) | |
| download | tcl-dbf049c0fba4506927b17c7ff9f7d66aa61cde18.zip tcl-dbf049c0fba4506927b17c7ff9f7d66aa61cde18.tar.gz tcl-dbf049c0fba4506927b17c7ff9f7d66aa61cde18.tar.bz2 | |
3559678 Fix bad filename normalization when the last component is the empty string.
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index db07c0e..2b9ff87 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -1764,7 +1764,7 @@ Tcl_FSGetNormalizedPath( */ Tcl_Obj *dir, *copy; - int cwdLen, pathType; + int tailLen, cwdLen, pathType; pathType = Tcl_FSGetPathType(fsPathPtr->cwdPtr); dir = Tcl_FSGetNormalizedPath(interp, fsPathPtr->cwdPtr); @@ -1776,7 +1776,12 @@ Tcl_FSGetNormalizedPath( UpdateStringOfFsPath(pathPtr); } - copy = AppendPath(dir, fsPathPtr->normPathPtr); + Tcl_GetStringFromObj(fsPathPtr->normPathPtr, &tailLen); + if (tailLen) { + copy = AppendPath(dir, fsPathPtr->normPathPtr); + } else { + copy = Tcl_DuplicateObj(dir); + } Tcl_IncrRefCount(dir); Tcl_IncrRefCount(copy); |