diff options
| author | hobbs <hobbs> | 2008-01-14 00:11:20 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2008-01-14 00:11:20 (GMT) |
| commit | 96ef6af4e3f9b90258b807aa289715f243e31565 (patch) | |
| tree | 433cedbb9845e222a81a91f531e61e2629c528dc /win | |
| parent | 16a9dc3e86b4bb9846622098b0f602e18fcbb818 (diff) | |
| download | tcl-96ef6af4e3f9b90258b807aa289715f243e31565.zip tcl-96ef6af4e3f9b90258b807aa289715f243e31565.tar.gz tcl-96ef6af4e3f9b90258b807aa289715f243e31565.tar.bz2 | |
* win/tclWinSerial.c (SerialCloseProc, TclWinOpenSerialChannel):
use critical section for read & write side. [Bug 1353846] (newman)
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinSerial.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c index 4041a89..263a9b9 100644 --- a/win/tclWinSerial.c +++ b/win/tclWinSerial.c @@ -11,7 +11,7 @@ * * Serial functionality implemented by Rolf.Schroedter@dlr.de * - * RCS: @(#) $Id: tclWinSerial.c,v 1.25.2.3 2005/10/05 06:33:52 hobbs Exp $ + * RCS: @(#) $Id: tclWinSerial.c,v 1.25.2.4 2008/01/14 00:11:22 hobbs Exp $ */ #include "tclWinInt.h" @@ -653,7 +653,6 @@ SerialCloseProc( CloseHandle(serialPtr->writeThread); CloseHandle(serialPtr->osWrite.hEvent); - DeleteCriticalSection(&serialPtr->csWrite); CloseHandle(serialPtr->evWritable); CloseHandle(serialPtr->evStartWriter); CloseHandle(serialPtr->evStopWriter); @@ -663,6 +662,8 @@ SerialCloseProc( } serialPtr->validMask &= ~TCL_WRITABLE; + DeleteCriticalSection(&serialPtr->csWrite); + /* * Don't close the Win32 handle if the handle is a standard channel * during the thread exit process. Otherwise, one thread may kill @@ -1467,6 +1468,7 @@ TclWinOpenSerialChannel(handle, channelName, permissions) */ SetCommTimeouts(handle, &no_timeout); + InitializeCriticalSection(&infoPtr->csWrite); if (permissions & TCL_READABLE) { infoPtr->osRead.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); @@ -1480,7 +1482,6 @@ TclWinOpenSerialChannel(handle, channelName, permissions) infoPtr->evWritable = CreateEvent(NULL, TRUE, TRUE, NULL); infoPtr->evStartWriter = CreateEvent(NULL, FALSE, FALSE, NULL); infoPtr->evStopWriter = CreateEvent(NULL, FALSE, FALSE, NULL); - InitializeCriticalSection(&infoPtr->csWrite); infoPtr->writeThread = CreateThread(NULL, 256, SerialWriterThread, infoPtr, 0, &id); } |