# HG changeset patch
# User John Beck <John.Beck@Oracle.COM>
# Date 1392924957 28800
# Node ID 436698adc770b253f54614bbeaf27bb16a1b6453
# Parent  a670946dda790ed51ad2bf43f8f0545dc0dcee6e
18239867 problem in UTILITY/PYTHON

diff -r a670946dda79 -r 436698adc770 components/python/python26/patches/Python26-29-recvfrom_into.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python26/patches/Python26-29-recvfrom_into.patch	Thu Feb 20 11:35:57 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
+@@ -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 */
diff -r a670946dda79 -r 436698adc770 components/python/python27/patches/17-recvfrom_into.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python27/patches/17-recvfrom_into.patch	Thu Feb 20 11:35:57 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
+@@ -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 */