summaryrefslogtreecommitdiffstats
path: root/generic/tclPathObj.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-04-27 18:23:39 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-04-27 18:23:39 (GMT)
commit3b9139924b1097de66255cd243de80d6eccb46ba (patch)
tree49158d5108ad115f779f031e7d855af9adbb7319 /generic/tclPathObj.c
parenta7fbbf49700d95954ce9bd3e780ae56f9e3b7421 (diff)
downloadtcl-3b9139924b1097de66255cd243de80d6eccb46ba.zip
tcl-3b9139924b1097de66255cd243de80d6eccb46ba.tar.gz
tcl-3b9139924b1097de66255cd243de80d6eccb46ba.tar.bz2
Backport fix for [Bug 2857044].
Diffstat (limited to 'generic/tclPathObj.c')
-rw-r--r--generic/tclPathObj.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index bb2c35d..da3b280 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1154,7 +1154,6 @@ Tcl_FSConvertToPathType(
UpdateStringOfFsPath(pathPtr);
}
FreeFsPathInternalRep(pathPtr);
- pathPtr->typePtr = NULL;
}
return Tcl_ConvertToType(interp, pathPtr, &tclFsPathType);
@@ -1173,7 +1172,6 @@ Tcl_FSConvertToPathType(
* UpdateStringOfFsPath(pathPtr);
* }
* FreeFsPathInternalRep(pathPtr);
- * pathPtr->typePtr = NULL;
* return Tcl_ConvertToType(interp, pathPtr, &tclFsPathType);
* }
* }
@@ -1963,7 +1961,6 @@ Tcl_FSGetNormalizedPath(
UpdateStringOfFsPath(pathPtr);
}
FreeFsPathInternalRep(pathPtr);
- pathPtr->typePtr = NULL;
if (Tcl_ConvertToType(interp, pathPtr, &tclFsPathType) != TCL_OK) {
return NULL;
}
@@ -2270,7 +2267,6 @@ TclFSEnsureEpochOk(
UpdateStringOfFsPath(pathPtr);
}
FreeFsPathInternalRep(pathPtr);
- pathPtr->typePtr = NULL;
if (SetFsPathFromAny(NULL, pathPtr) != TCL_OK) {
return TCL_ERROR;
}
@@ -2660,6 +2656,7 @@ FreeFsPathInternalRep(
}
ckfree((char *) fsPathPtr);
+ pathPtr->typePtr = NULL;
}
static void