Skip to content

bpo-30237: Output error when ReadConsole is canceled by CancelSynchronousIo. #7911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 19, 2018
Merged

bpo-30237: Output error when ReadConsole is canceled by CancelSynchronousIo. #7911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c166f4
convert content length to string before putting to header
ValeriyaSinevich Jun 16, 2018
02842b6
news entry
ValeriyaSinevich Jun 17, 2018
11a898a
output error when ReadConsole is canceled by CancelSynchronousIo inst…
ValeriyaSinevich Jun 25, 2018
c2dfff7
news
ValeriyaSinevich Jun 25, 2018
7145a7f
output error when ReadConsole is canceled by CancelSynchronousIo inst…
ValeriyaSinevich Jun 25, 2018
34e5061
news
ValeriyaSinevich Jun 25, 2018
c09a4c6
Merge branch 'bpo-30237' of https://github.com/ValeriyaSinevich/cpyth…
ValeriyaSinevich Jun 25, 2018
29dd01f
output error in myreadline.c
ValeriyaSinevich Jun 25, 2018
79ca38a
remove spaces around -
ValeriyaSinevich Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2018-06-25-09-33-48.bpo-30237.EybiZA.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Output error when ReadConsole is canceled by CancelSynchronousIo instead of
crashing.
6 changes: 5 additions & 1 deletion Modules/_io/winconsoleio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,14 +556,18 @@ read_console_w(HANDLE handle, DWORD maxlen, DWORD *readlen) {
Py_BEGIN_ALLOW_THREADS
DWORD off = 0;
while (off < maxlen) {
DWORD n, len = min(maxlen - off, BUFSIZ);
DWORD n = (DWORD)-1;
DWORD len = min(maxlen - off, BUFSIZ);
SetLastError(0);
BOOL res = ReadConsoleW(handle, &buf[off], len, &n, NULL);

if (!res) {
err = GetLastError();
break;
}
if (n == (DWORD)-1 && (err = GetLastError()) == ERROR_OPERATION_ABORTED) {
break;
}
if (n == 0) {
err = GetLastError();
if (err != ERROR_OPERATION_ABORTED)
Expand Down
5 changes: 4 additions & 1 deletion Parser/myreadline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ _PyOS_WindowsConsoleReadline(HANDLE hStdIn)
char *buf = NULL;
int err = 0;

n_read = 0;
n_read = (DWORD)-1;
total_read = 0;
wbuf = wbuf_local;
wbuflen = sizeof(wbuf_local) / sizeof(wbuf_local[0]) - 1;
Expand All @@ -118,6 +118,9 @@ _PyOS_WindowsConsoleReadline(HANDLE hStdIn)
err = GetLastError();
goto exit;
}
if (n_read == (DWORD)-1 && (err = GetLastError()) == ERROR_OPERATION_ABORTED) {
break;
}
if (n_read == 0) {
int s;
err = GetLastError();
Expand Down