Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-30237: Output error when ReadConsole is canceled by CancelSynchronousIo. (GH-7911)

This commit is contained in:
ValeriyaSinevich 2018-07-19 15:34:03 -07:00 committed by Steve Dower
parent 81950495ba
commit ce75df3031
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Windows/2018-06-25-09-33-48.bpo-30237.EybiZA.rst Normal file
View File

@ -0,0 +1,2 @@
Output error when ReadConsole is canceled by CancelSynchronousIo instead of
crashing.

6
Modules/_io/winconsoleio.c
View File

@ -556,7 +556,8 @@ read_console_w(HANDLE handle, DWORD maxlen, DWORD *readlen) {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
DWORD off = 0; DWORD off = 0;
while (off < maxlen) { while (off < maxlen) {
DWORD n, len = min(maxlen - off, BUFSIZ); DWORD n = (DWORD)-1;
DWORD len = min(maxlen - off, BUFSIZ);
SetLastError(0); SetLastError(0);
BOOL res = ReadConsoleW(handle, &buf[off], len, &n, NULL); BOOL res = ReadConsoleW(handle, &buf[off], len, &n, NULL);
@ -564,6 +565,9 @@ read_console_w(HANDLE handle, DWORD maxlen, DWORD *readlen) {
err = GetLastError(); err = GetLastError();
break; break;
} }
if (n == (DWORD)-1 && (err = GetLastError()) == ERROR_OPERATION_ABORTED) {
break;
}
if (n == 0) { if (n == 0) {
err = GetLastError(); err = GetLastError();
if (err != ERROR_OPERATION_ABORTED) if (err != ERROR_OPERATION_ABORTED)

5
Parser/myreadline.c
View File

@ -109,7 +109,7 @@ _PyOS_WindowsConsoleReadline(HANDLE hStdIn)
char *buf = NULL; char *buf = NULL;
int err = 0; int err = 0;
n_read = 0; n_read = (DWORD)-1;
total_read = 0; total_read = 0;
wbuf = wbuf_local; wbuf = wbuf_local;
wbuflen = sizeof(wbuf_local) / sizeof(wbuf_local[0]) - 1; wbuflen = sizeof(wbuf_local) / sizeof(wbuf_local[0]) - 1;
@ -121,6 +121,9 @@ _PyOS_WindowsConsoleReadline(HANDLE hStdIn)
err = GetLastError(); err = GetLastError();
goto exit; goto exit;
} }
if (n_read == (DWORD)-1 && (err = GetLastError()) == ERROR_OPERATION_ABORTED) {
break;
}
if (n_read == 0) { if (n_read == 0) {
int s; int s;
err = GetLastError(); err = GetLastError();