summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-01-31 20:02:58 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-01-31 20:02:58 (GMT)
commit4c98b1f4cda633b5554ac990dfde7401bd0d67b1 (patch)
tree23d236d0a6d7feb0f30c29bca301b2198d48fc0d /generic
parent4e9008ff1b243981772ef48e1e92f2a95301b0e3 (diff)
downloadtcl-4c98b1f4cda633b5554ac990dfde7401bd0d67b1.zip
tcl-4c98b1f4cda633b5554ac990dfde7401bd0d67b1.tar.gz
tcl-4c98b1f4cda633b5554ac990dfde7401bd0d67b1.tar.bz2
Do not call updateStringProc directly. We have TclGetString() for that.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 542d97d..71f8f53 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -10429,17 +10429,8 @@ SetChannelFromAny(
}
}
if (objPtr->typePtr != &tclChannelType) {
- Tcl_Channel chan;
+ Tcl_Channel chan = Tcl_GetChannel(interp, TclGetString(objPtr), NULL);
- /*
- * We need a valid string with which to check for a valid channel, but
- * make sure not to free internal rep until validated. [Bug 1847044]
- */
- if ((objPtr->typePtr != NULL) && (objPtr->bytes == NULL)) {
- objPtr->typePtr->updateStringProc(objPtr);
- }
-
- chan = Tcl_GetChannel(interp, objPtr->bytes, NULL);
if (chan == NULL) {
return TCL_ERROR;
}