merge 3.3 (#20246)

1 files changed, 5 insertions, 0 deletions

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 6c229bcc10..9cc317f5ef 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -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);