18239867 problem in UTILITY/PYTHON
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 13 Feb 2014 17:12:07 -0800
changeset 1710 7af9a5a0f495
parent 1709 beec163c6a30
child 1711 d19b95bc2d59
18239867 problem in UTILITY/PYTHON
components/python/python26/patches/Python26-33-recvfrom_into.patch
components/python/python27/patches/19-recvfrom_into.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python26/patches/Python26-33-recvfrom_into.patch	Thu Feb 13 17:12:07 2014 -0800
@@ -0,0 +1,18 @@
+# Fix adapted from upstream: http://bugs.python.org/issue20246
+
+--- Python-2.6.8/Modules/socketmodule.c	2014-02-12 15:21:37.045342837 -0800
++++ Python-2.6.8/Modules/socketmodule.c	2014-02-12 15:23:04.666145417 -0800
[email protected]@ -2635,6 +2635,13 @@
+         recvlen = buflen;
+     }
+ 
++    /* Check if the buffer is large enough */
++    if (buflen < recvlen) {
++        PyErr_SetString(PyExc_ValueError,
++                        "buffer too small for requested bytes");
++        return NULL;
++    }
++
+     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
+     if (readlen < 0) {
+         /* Return an error */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python27/patches/19-recvfrom_into.patch	Thu Feb 13 17:12:07 2014 -0800
@@ -0,0 +1,18 @@
+# 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
[email protected]@ -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 */