diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | win/tclWinChan.c | 21 |
2 files changed, 30 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2005-01-19 Mo DeJong <mdejong@users.sourceforge.net> + + * win/tclWinChan.c (FileCloseProc): Invoke + TclpCutFileChannel() to remove a FileInfo from + the thread local list before deallocating it. + This should have been done via an earlier + call to Tcl_CutChannel, but I was running into + a crash in the next call to Tcl_CutChannel + during the IO finalization stage. + 2005-01-17 Vince Darley <vincentdarley@users.sourceforge.net> * tests/winFCmd.test: made test independent of current drive. diff --git a/win/tclWinChan.c b/win/tclWinChan.c index 60f9aef..9333726 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinChan.c,v 1.30.2.1 2004/06/21 22:07:32 mdejong Exp $ + * RCS: @(#) $Id: tclWinChan.c,v 1.30.2.2 2005/01/19 22:09:58 mdejong Exp $ */ #include "tclWinInt.h" @@ -401,6 +401,8 @@ FileCloseProc(instanceData, interp) Tcl_Interp *interp; /* Not used. */ { FileInfo *fileInfoPtr = (FileInfo *) instanceData; + FileInfo *infoPtr; + ThreadSpecificData *tsdPtr; int errorCode = 0; /* @@ -425,6 +427,23 @@ FileCloseProc(instanceData, interp) } } + /* + * See if this FileInfo* is still on the thread local list. + */ + tsdPtr = TCL_TSD_INIT(&dataKey); + for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL; + infoPtr = infoPtr->nextPtr) { + if (infoPtr == fileInfoPtr) { + /* + * This channel exists on the thread local list. It should + * have been removed by an earlier call to TclpCutFileChannel, + * but do that now since just deallocating fileInfoPtr would + * leave an deallocated pointer on the thread local list. + */ + TclpCutFileChannel(fileInfoPtr->channel); + break; + } + } ckfree((char *)fileInfoPtr); return errorCode; } |