tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addressed Thread Hanging Issue (#374) 

- Replaced TerminateThread() call with an interrupt routine to gracefully call _endthreadex(0).
- Resolves https://github.com/PowerShell/Win32-OpenSSH/issues/1338.
This commit is contained in:
Bryan Berns 2019-05-21 16:57:00 -04:00 committed by Manoj Ampalam
parent 8d7ab2b801
commit 18884b29fd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/win32/win32compat/termio.c
View File

@ -244,6 +244,12 @@ syncio_initiate_write(struct w32_io* pio, DWORD num_bytes)
return 0;
}
static VOID CALLBACK
InterruptThread(_In_ ULONG_PTR dwParam)
{
_endthreadex(0);
}
/* close */
int
syncio_close(struct w32_io* pio)
@ -258,10 +264,12 @@ syncio_close(struct w32_io* pio)
1. For console - the read thread is blocked by the while loop on raw mode
2. Function ReadFile on Win7 machine dees not return when no content to read in non-interactive mode.
*/
if (FILETYPE(pio) == FILE_TYPE_CHAR && (IsWin7OrLess() || in_raw_mode))
TerminateThread(pio->read_overlapped.hEvent, 0);
else
WaitForSingleObject(pio->read_overlapped.hEvent, INFINITE);
if (FILETYPE(pio) == FILE_TYPE_CHAR && (IsWin7OrLess() || in_raw_mode)) {
QueueUserAPC(InterruptThread, pio->read_overlapped.hEvent, (ULONG_PTR)NULL);
CancelSynchronousIo(pio->read_overlapped.hEvent);
}
WaitForSingleObject(pio->read_overlapped.hEvent, INFINITE);
}
if (pio->write_details.pending)
WaitForSingleObject(pio->write_overlapped.hEvent, INFINITE);

2
contrib/win32/win32compat/tncon.c
View File

@ -96,7 +96,7 @@ NetWriteString2(SOCKET sock, char* source, size_t len, int options)
BOOL
DataAvailable(HANDLE h)
{
DWORD dwRet = WaitForSingleObject(h, INFINITE);
DWORD dwRet = WaitForSingleObjectEx(h, INFINITE, TRUE);
if (dwRet == WAIT_OBJECT_0)
return TRUE;
if (dwRet == WAIT_FAILED)