summaryrefslogtreecommitdiff
path: root/lang/python32/files/patch-objects_obmalloc.c
diff options
context:
space:
mode:
authorHye-Shik Chang <perky@FreeBSD.org>2008-10-13 08:23:00 +0000
committerHye-Shik Chang <perky@FreeBSD.org>2008-10-13 08:23:00 +0000
commit3813a5dbe7d0608965d690d98e1730ad5c8878ff (patch)
treec6bc50f8d593ff6f8b9f46161b022682d1e508cd /lang/python32/files/patch-objects_obmalloc.c
parent- Fix synergy crashing on copy and paste from Fedora (diff)
Introduce two new versions of Python: 2.6 and 3.0rc1 (finally!)
Python 2.6 will be the next default python version when enough testings of consumer ports are done. The new "2to3" program is renamed to 2to3-2.6 and 2to3-3.0 for each version, respectively. Repo-copied by: marcus
Notes
Notes: svn path=/head/; revision=221521
Diffstat (limited to 'lang/python32/files/patch-objects_obmalloc.c')
-rw-r--r--lang/python32/files/patch-objects_obmalloc.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/lang/python32/files/patch-objects_obmalloc.c b/lang/python32/files/patch-objects_obmalloc.c
deleted file mode 100644
index 27050596fbfc..000000000000
--- a/lang/python32/files/patch-objects_obmalloc.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- Objects/obmalloc.c.orig 2008-02-14 11:26:18.000000000 +0000
-+++ Objects/obmalloc.c 2008-08-30 10:39:43.000000000 +0100
-@@ -727,6 +727,15 @@
- uint size;
-
- /*
-+ * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes.
-+ * Most python internals blindly use a signed Py_ssize_t to track
-+ * things without checking for overflows or negatives.
-+ * As size_t is unsigned, checking for nbytes < 0 is not required.
-+ */
-+ if (nbytes > PY_SSIZE_T_MAX)
-+ return NULL;
-+
-+ /*
- * This implicitly redirects malloc(0).
- */
- if ((nbytes - 1) < SMALL_REQUEST_THRESHOLD) {
-@@ -1130,6 +1139,15 @@
- if (p == NULL)
- return PyObject_Malloc(nbytes);
-
-+ /*
-+ * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes.
-+ * Most python internals blindly use a signed Py_ssize_t to track
-+ * things without checking for overflows or negatives.
-+ * As size_t is unsigned, checking for nbytes < 0 is not required.
-+ */
-+ if (nbytes > PY_SSIZE_T_MAX)
-+ return NULL;
-+
- pool = POOL_ADDR(p);
- if (Py_ADDRESS_IN_RANGE(p, pool)) {
- /* We're in charge of this block */