Issue #18382: Zero-length messages are consumed by ReadFile on Windows 8 and later

This commit is contained in:
Steve Dower 2015-03-02 08:06:30 -08:00
commit 4e02f8f4ae
1 changed files with 11 additions and 2 deletions

View File

@ -829,7 +829,7 @@ if sys.platform == 'win32':
try:
ov, err = _winapi.ReadFile(fileno(), 0, True)
except OSError as e:
err = e.winerror
ov, err = None, e.winerror
if err not in _ready_errors:
raise
if err == _winapi.ERROR_IO_PENDING:
@ -838,7 +838,16 @@ if sys.platform == 'win32':
else:
# If o.fileno() is an overlapped pipe handle and
# err == 0 then there is a zero length message
# in the pipe, but it HAS NOT been consumed.
# in the pipe, but it HAS NOT been consumed...
if ov and sys.getwindowsversion()[:2] >= (6, 2):
# ... except on Windows 8 and later, where
# the message HAS been consumed.
try:
_, err = ov.GetOverlappedResult(False)
except OSError as e:
err = e.winerror
if not err and hasattr(o, '_got_empty_message'):
o._got_empty_message = True
ready_objects.add(o)
timeout = 0