diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-08 10:30:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-08 10:30:07 (GMT) |
| commit | d8785b835887dc0c3e6669537d6afbc4389b2153 (patch) | |
| tree | 4a3f633d0bc10bf4df7bbdc53677c58f99248e9b /generic | |
| parent | 7de7029fa536bea308baf31b470cfceb3c4a626d (diff) | |
| parent | 47620e4ba8a3fc6f4efee83655e01de74cca33b2 (diff) | |
| download | tcl-d8785b835887dc0c3e6669537d6afbc4389b2153.zip tcl-d8785b835887dc0c3e6669537d6afbc4389b2153.tar.gz tcl-d8785b835887dc0c3e6669537d6afbc4389b2153.tar.bz2 | |
Merge core-8-6-branch: Bug [a47641a031]. TclJoinPath was calling TclNewFSPathObj with a first argument that was not an absolute path. Added a check for that. Fixes Windows test failures fileSystem-1.{3,4}
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclPathObj.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index cf8d784..68ec2c4 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -869,12 +869,16 @@ TclJoinPath( * object which can be normalized more efficiently. Currently we only * use the special case when we have exactly two elements, but we * could expand that in the future. + * + * Bugfix [a47641a0]. TclNewFSPathObj requires first argument + * to be an absolute path. Added a check for that elt is absolute. */ if ((i == (elements-2)) && (i == 0) - && (elt->typePtr == &tclFsPathType) - && !((elt->bytes != NULL) && (elt->bytes[0] == '\0'))) { - Tcl_Obj *tailObj = objv[i+1]; + && (elt->typePtr == &tclFsPathType) + && !((elt->bytes != NULL) && (elt->bytes[0] == '\0')) + && TclGetPathType(elt, NULL, NULL, NULL) == TCL_PATH_ABSOLUTE) { + Tcl_Obj *tailObj = objv[i+1]; type = TclGetPathType(tailObj, NULL, NULL, NULL); if (type == TCL_PATH_RELATIVE) { |