commit c3af73d580888b4d444264e79dce6ec0818522cd
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sun Jul 29 02:32:02 2018 -0700
committer Steve Dower <steve.dower@microsoft.com> Sun Jul 29 10:32:02 2018 +0100
tree ace20ca3a4db511cb5838e629218c0a1d014327f
parent 1e98d87961ec752a1623135f4d7e8a41820ae256

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

(cherry picked from commit ce75df3031c86b78311b1ad76c39c0b39d7d7424)

Co-authored-by: ValeriyaSinevich <valeriya.sinevich@phystech.edu>

Modules/_io/winconsoleio.c

diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
index b85c11b..4d3d695 100644
--- a/Modules/_io/winconsoleio.c
+++ b/Modules/_io/winconsoleio.c
@@ -556,7 +556,8 @@
     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);
 
@@ -564,6 +565,9 @@
             err = GetLastError();
             break;
         }
+        if (n == (DWORD)-1 && (err = GetLastError()) == ERROR_OPERATION_ABORTED) {
+            break;
+        }
         if (n == 0) {
             err = GetLastError();
             if (err != ERROR_OPERATION_ABORTED)