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

gh-98793: Fix typecheck in `overlapped.c` (#98835) 

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
This commit is contained in:
Charlie Zhao 2022-10-30 12:34:46 +08:00 committed by GitHub
parent fc94d55ff4
commit 3ac8c0ab6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_asyncio/test_windows_events.py
View File

@ -239,6 +239,17 @@ class ProactorTests(test_utils.TestCase):
self.close_loop(self.loop)
self.assertFalse(self.loop.call_exception_handler.called)
def test_address_argument_type_error(self):
# Regression test for https://github.com/python/cpython/issues/98793
proactor = self.loop._proactor
sock = socket.socket(type=socket.SOCK_DGRAM)
bad_address = None
with self.assertRaises(TypeError):
proactor.connect(sock, bad_address)
with self.assertRaises(TypeError):
proactor.sendto(sock, b'abc', addr=bad_address)
sock.close()
class WinPolicyTests(test_utils.TestCase):

1
Misc/NEWS.d/next/Library/2022-10-29-03-40-18.gh-issue-98793.WSPB4A.rst Normal file
View File

@ -0,0 +1 @@
Fix argument typechecks in :func:`!_overlapped.WSAConnect` and :func:`!_overlapped.Overlapped.WSASendTo` functions.

10
Modules/clinic/overlapped.c.h generated
View File

@ -1093,6 +1093,10 @@ _overlapped_WSAConnect(PyObject *module, PyObject *const *args, Py_ssize_t nargs
if (!ConnectSocket && PyErr_Occurred()) {
goto exit;
}
if (!PyTuple_Check(args[1])) {
_PyArg_BadArgument("WSAConnect", "argument 2", "tuple", args[1]);
goto exit;
}
AddressObj = args[1];
return_value = _overlapped_WSAConnect_impl(module, ConnectSocket, AddressObj);
@ -1140,6 +1144,10 @@ _overlapped_Overlapped_WSASendTo(OverlappedObject *self, PyObject *const *args,
if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
goto exit;
}
if (!PyTuple_Check(args[3])) {
_PyArg_BadArgument("WSASendTo", "argument 4", "tuple", args[3]);
goto exit;
}
AddressObj = args[3];
return_value = _overlapped_Overlapped_WSASendTo_impl(self, handle, &bufobj, flags, AddressObj);
@ -1254,4 +1262,4 @@ exit:
return return_value;
}
/*[clinic end generated code: output=e0f866222bd5873b input=a9049054013a1b77]*/
/*[clinic end generated code: output=b2e89694b8de3d00 input=a9049054013a1b77]*/

8
Modules/overlapped.c
View File

@ -1674,7 +1674,7 @@ Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
_overlapped.WSAConnect
client_handle as ConnectSocket: HANDLE
address_as_bytes as AddressObj: object
address_as_bytes as AddressObj: object(subclass_of='&PyTuple_Type')
/
Bind a remote address to a connectionless (UDP) socket.
@ -1683,7 +1683,7 @@ Bind a remote address to a connectionless (UDP) socket.
static PyObject *
_overlapped_WSAConnect_impl(PyObject *module, HANDLE ConnectSocket,
PyObject *AddressObj)
/*[clinic end generated code: output=ea0b4391e94dad63 input=169f8075e9ae7fa4]*/
/*[clinic end generated code: output=ea0b4391e94dad63 input=7cf65313d49c015a]*/
{
char AddressBuf[sizeof(struct sockaddr_in6)];
SOCKADDR *Address = (SOCKADDR*)AddressBuf;
@ -1717,7 +1717,7 @@ _overlapped.Overlapped.WSASendTo
handle: HANDLE
buf as bufobj: Py_buffer
flags: DWORD
address_as_bytes as AddressObj: object
address_as_bytes as AddressObj: object(subclass_of='&PyTuple_Type')
/
Start overlapped sendto over a connectionless (UDP) socket.
@ -1727,7 +1727,7 @@ static PyObject *
_overlapped_Overlapped_WSASendTo_impl(OverlappedObject *self, HANDLE handle,
Py_buffer *bufobj, DWORD flags,
PyObject *AddressObj)
/*[clinic end generated code: output=3cdedc4cfaeb70cd input=b7c1749a62e2e374]*/
/*[clinic end generated code: output=3cdedc4cfaeb70cd input=31f44cd4ab92fc33]*/
{
char AddressBuf[sizeof(struct sockaddr_in6)];
SOCKADDR *Address = (SOCKADDR*)AddressBuf;