a bit of cleanup

3 files changed, 21 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index a0b70ca..a01c196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,17 @@
 2009-11-19  Jan Nijtmans  <nijtmans@users.sf.net>
 
-	* win/Makefile.in         Create tcltest86.dll as dynamic Tcltest package
-	* generic/tclTest.c       Remove extraneus prototypes, follow-up
-	* generic/tclTestObj.c    to [Bug 2883850]
-	* tests/chanio.test       Test-case for fixed [Bug 2849797]
-	* tests/safe.test         Fix safe-10.1 and safe-10.4 test cases,
-	                          making the wrong assumption that Tcltest
-	                          is a static package.
-	* generic/tclEncoding.c   Updated freeIntRepProc routines so
-                              that they set the typePtr field to
-                              NULL so that the Tcl_Obj is not left
-                              in an inconsistent state.
-                              [Bug 2857044]
-	* unix/tcl.m4:            [Tcl Patch #2883533] tcl.m4 support for Haiku OS
-	* unix/configure:         (regenerated)
+	* win/Makefile.in:	Create tcltest86.dll as dynamic Tcltest package
+	* generic/tclTest.c:	Remove extraneus prototypes, follow-up
+	* generic/tclTestObj.c:	to [Bug 2883850]
+	* tests/chanio.test:	Test-cases for fixed [Bug 2849797]
+	* tests/io.test:
+	* tests/safe.test:	Fix safe-10.1 and safe-10.4 test cases, making
+	the wrong assumption that Tcltest is a static package.
+	* generic/tclEncoding.c:Updated freeIntRepProc routines so that they
+	* generic/tclVar.c:	set the typePtr field to NULL so that the
+	Tcl_Obj is not left in an inconsistent state.  [Bug 2857044]
+	* unix/tcl.m4:		[Tcl Patch #2883533] tcl.m4 support for Haiku OS
+	* unix/configure:	autoconf-2.59
 
 2009-11-19  Don Porter  <dgp@users.sourceforge.net>
 
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 3bbe63f..54699ce 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -16,7 +16,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclVar.c,v 1.183 2009/10/17 22:24:38 dkf Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.184 2009/11/20 00:19:46 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -4770,6 +4770,7 @@ FreeLocalVarName(
     if (namePtr) {
 	Tcl_DecrRefCount(namePtr);
     }
+    objPtr->typePtr = NULL;
 }
 
 static void
@@ -4811,6 +4812,7 @@ FreeNsVarName(
 	    CleanupVar(varPtr, NULL);
 	}
     }
+    objPtr->typePtr = NULL;
 }
 
 static void
@@ -4850,6 +4852,7 @@ FreeParsedVarName(
 	TclDecrRefCount(arrayPtr);
 	ckfree(elem);
     }
+    objPtr->typePtr = NULL;
 }
 
 static void
diff --git a/tests/io.test b/tests/io.test
index 1ad9f6e..2b08454 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: io.test,v 1.94 2009/11/12 17:25:18 andreas_kupries Exp $
+# RCS: @(#) $Id: io.test,v 1.95 2009/11/20 00:19:46 dgp Exp $
 
 if {[catch {package require tcltest 2}]} {
     puts stderr "Skipping tests in [info script].  tcltest 2 required."
@@ -1670,8 +1670,8 @@ test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec openpipe} {
 out
 } {err
 }}
-# This test relies on the fact that the smallest available fd is used first.
-test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unix} {
+# This test relies on the fact that stdout is used before stderr
+test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec} {
     set f [open $path(test1) w]
     puts -nonewline $f { close stdin
 	close stdout
@@ -1696,8 +1696,8 @@ test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unix} {
     close $f2
     set result
 } {{ close stdin
-file1
-} {file2
+stdout
+} {stderr
 }}
 catch {interp delete z}
 test io-14.5 {Tcl_GetChannel: stdio name translation} {