summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-02-05 16:55:32 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-02-05 16:55:32 (GMT)
commit593462fc80d3e1a4684644f3237115112131f83f (patch)
treeceea26bd2c0c11ed71f7fb1e4f88b4d0adbe7632 /win
parentd20b1b94254275c9b62e7adf30c09a2a7c5443b2 (diff)
parent7d50b7b1515618501f8eaf3d76ea80c6c796a87d (diff)
downloadtcl-593462fc80d3e1a4684644f3237115112131f83f.zip
tcl-593462fc80d3e1a4684644f3237115112131f83f.tar.gz
tcl-593462fc80d3e1a4684644f3237115112131f83f.tar.bz2
[Bug 3603434] Make sure TclpObjNormalizePath() properly declares "a:/" to
be normalized, even when no "A:" drive is present on the system.
Diffstat (limited to 'win')
-rw-r--r--win/tclWinFile.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 7224345..5717a3f 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -2570,6 +2570,12 @@ TclpObjNormalizePath(
}
Tcl_DStringAppend(&dsNorm, nativePath, len);
lastValidPathEnd = currentPathEndPosition;
+ } else if (nextCheckpoint == 0) {
+ /* Path starts with a drive designation
+ * that's not actually on the system.
+ * We still must normalize up past the
+ * first separator. [Bug 3603434] */
+ currentPathEndPosition++;
}
}
Tcl_DStringFree(&ds);
@@ -2712,6 +2718,12 @@ TclpObjNormalizePath(
Tcl_DStringAppend(&dsNorm, nativePath,
(int)(sizeof(WCHAR) * len));
lastValidPathEnd = currentPathEndPosition;
+ } else if (nextCheckpoint == 0) {
+ /* Path starts with a drive designation
+ * that's not actually on the system.
+ * We still must normalize up past the
+ * first separator. [Bug 3603434] */
+ currentPathEndPosition++;
}
}
Tcl_DStringFree(&ds);