diff options
| author | oehhar <harald.oehlmann@elmicron.de> | 2014-03-23 11:42:35 (GMT) |
|---|---|---|
| committer | oehhar <harald.oehlmann@elmicron.de> | 2014-03-23 11:42:35 (GMT) |
| commit | 8a2617f3adce19edcb1ff2f8099bf33435f9701d (patch) | |
| tree | 932dc80c1cabc0f77e5211f6f3516d54b2707744 | |
| parent | 19de01829d8d5c466d392806d3b327ee49e20d58 (diff) | |
| download | tcl-8a2617f3adce19edcb1ff2f8099bf33435f9701d.zip tcl-8a2617f3adce19edcb1ff2f8099bf33435f9701d.tar.gz tcl-8a2617f3adce19edcb1ff2f8099bf33435f9701d.tar.bz2 | |
Be sure tsd pointer to the info structure is invalidated before memory free
| -rw-r--r-- | win/tclWinSock.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c index 3d41bd3..b1e2768 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -935,7 +935,7 @@ TcpCloseProc( TcpState *statePtr = instanceData; /* TIP #218 */ int errorCode = 0; - /* ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); */ + ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); /* * Check that WinSock is initialized; do not call it if not, to prevent @@ -970,6 +970,23 @@ TcpCloseProc( } /* + * Clear an eventual tsd info list pointer. + * This may be called, if an async socket connect fails or is closed + * between connect and thread action callback. + */ + if (tsdPtr->pendingTcpState != NULL + && tsdPtr->pendingTcpState == statePtr) { + + /* get infoPtr lock, because this concerns the notifier thread */ + WaitForSingleObject(tsdPtr->socketListLock, INFINITE); + + tsdPtr->pendingTcpState = NULL; + + /* Free list lock */ + SetEvent(tsdPtr->socketListLock); + } + + /* * TIP #218. Removed the code removing the structure from the global * socket list. This is now done by the thread action callbacks, and only * there. This happens before this code is called. We can free without @@ -1644,6 +1661,8 @@ CreateClientSocket( WaitForSingleObject(tsdPtr->socketListLock, INFINITE); /* + * Bugfig for 336441ed59 to not ignore notifications until the + * infoPtr is in the list. * Check if my statePtr is already in the tsdPtr->socketList * It is set after this call by TcpThreadActionProc and is set * on a second round. |