components/python/python27/patches/19-recvfrom_into.patch
author John Beck <John.Beck@Oracle.COM>
Thu, 13 Feb 2014 17:12:07 -0800
changeset 1710 7af9a5a0f495
child 1914 00e8dbcb9b1e
permissions -rw-r--r--
18239867 problem in UTILITY/PYTHON

# Fix from upstream: http://bugs.python.org/issue20246

--- Python-2.6.8/Modules/socketmodule.c	2012-04-09 16:07:34.000000000 -0700
+++ Python-2.6.8/Modules/socketmodule.c	2014-02-12 15:27:10.106066138 -0800
@@ -2677,6 +2677,13 @@
         recvlen = buflen;
     }
 
+    /* Check if the buffer is large enough */
+    if (buflen < recvlen) {
+        PyErr_SetString(PyExc_ValueError,
+                        "buffer too small for requested bytes");
+        goto error;
+    }
+
     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
     if (readlen < 0) {
         /* Return an error */