summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcoldstore <coldstore>2006-10-13 12:57:21 (GMT)
committercoldstore <coldstore>2006-10-13 12:57:21 (GMT)
commitb47aca32b8e6db041e5d1ae02f9fe2f98149c98c (patch)
treebee0561e31c995f91de38869aca96554f899a3cb
parentae30ab71db6aae4fccdee34cb0716454952141d4 (diff)
downloadtcl-b47aca32b8e6db041e5d1ae02f9fe2f98149c98c.zip
tcl-b47aca32b8e6db041e5d1ae02f9fe2f98149c98c.tar.gz
tcl-b47aca32b8e6db041e5d1ae02f9fe2f98149c98c.tar.bz2
win/tclWinFile.c: alfredd supplied patch to fix Bug 1575837
-rw-r--r--ChangeLog1
-rw-r--r--win/tclWinFile.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1db5404..dc83751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* win/tclWinFile.c: corrected erroneous attempt to protect
against NULL return from Tcl_FSGetNormalizedPath
per Bug 1548263 causing Bug 1575837.
+ * win/tclWinFile.c: alfredd supplied patch to fix Bug 1575837
2006-10-13 Daniel Steffen <das@users.sourceforge.net>
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 41e1733..2a8a2a5 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinFile.c,v 1.89 2006/10/13 04:53:51 coldstore Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.90 2006/10/13 12:57:21 coldstore Exp $
*/
/* #define _WIN32_WINNT 0x0500 */
@@ -2489,13 +2489,13 @@ TclpObjLink(
int res;
TCHAR *LinkTarget;
TCHAR *LinkSource = (TCHAR *) Tcl_FSGetNativePath(pathPtr);
+ Tcl_Obj *normalizedToPtr = Tcl_FSGetNormalizedPath(NULL, toPtr);
- toPtr = Tcl_FSGetNormalizedPath(NULL, toPtr);
- if (toPtr == NULL) {
+ if (normalizedToPtr == NULL) {
return NULL;
}
- LinkTarget = (TCHAR *) Tcl_FSGetNativePath(toPtr);
+ LinkTarget = (TCHAR *) Tcl_FSGetNativePath(normalizedToPtr);
if (LinkSource == NULL || LinkTarget == NULL) {
return NULL;