Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
40 changes: 40 additions & 0 deletions Lib/test/test_asyncio/test_windows_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,5 +129,45 @@ def test_popen(self):
pass


class OverlappedLeakTests(unittest.TestCase):
def _invalid_socket_handle(self):
return 0

def test_overlapped_wsasendto_failure_releases_user_buffer(self):
ov = _overlapped.Overlapped()
buf = bytearray(4096)
with self.assertRaises(OSError):
ov.WSASendTo(self._invalid_socket_handle(),
memoryview(buf), 0, ("127.0.0.1", 1))
# If the exported buffer is still held, this will raise BufferError.
buf.append(1)

def test_overlapped_wsarecvfrominto_failure_releases_user_buffer(self):
ov = _overlapped.Overlapped()
buf = bytearray(4096)
with self.assertRaises(OSError):
ov.WSARecvFromInto(self._invalid_socket_handle(),
memoryview(buf), len(buf), 0)
# If the exported buffer is still held, this will raise BufferError.
buf.append(1)

@support.refcount_test
Comment thread
hyongtao-code marked this conversation as resolved.
Outdated
def test_overlapped_wsarecvfrom_failure_does_not_leak_allocated_buffer(self):
gettotalrefcount = support.get_attribute(sys, "gettotalrefcount")

def run_once():
ov = _overlapped.Overlapped()
with self.assertRaises(OSError):
ov.WSARecvFrom(self._invalid_socket_handle(), 4096, 0)

# Warm up
run_once()
before = gettotalrefcount()
for _ in range(2000):
run_once()
after = gettotalrefcount()
self.assertAlmostEqual(after - before, 0, delta=20)


Comment thread
hyongtao-code marked this conversation as resolved.
if __name__ == '__main__':
unittest.main()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix possible buffer leaks in Windows overlapped I/O operations when the operation fails.
6 changes: 3 additions & 3 deletions Modules/overlapped.c
Original file line number Diff line number Diff line change
Expand Up @@ -1806,7 +1806,7 @@ _overlapped_Overlapped_WSASendTo_impl(OverlappedObject *self, HANDLE handle,
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
Comment thread
hyongtao-code marked this conversation as resolved.
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1873,7 +1873,7 @@ _overlapped_Overlapped_WSARecvFrom_impl(OverlappedObject *self,
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down Expand Up @@ -1940,7 +1940,7 @@ _overlapped_Overlapped_WSARecvFromInto_impl(OverlappedObject *self,
case ERROR_IO_PENDING:
Py_RETURN_NONE;
default:
self->type = TYPE_NOT_STARTED;
Overlapped_clear(self);
return SetFromWindowsErr(err);
}
}
Expand Down
Loading