mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.3 (#20246)

Browse source
This commit is contained in:
Benjamin Peterson 2014-01-13 23:14:42 -05:00
parent e74f96ded5
commit c6b37e21f5
4 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Modules/socketmodule.c
View file

@ -2875,6 +2875,11 @@ sock_recvfrom_into(PySocketSockObject *s, PyObject *args, PyObject* kwds)
if (recvlen == 0) {
/* If nbytes was not specified, use the buffer's length */
recvlen = buflen;
} else if (recvlen > buflen) {
PyBuffer_Release(&pbuf);
PyErr_SetString(PyExc_ValueError,
"nbytes is greater than the length of the buffer");
return NULL;
}
readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);