From 3813a5dbe7d0608965d690d98e1730ad5c8878ff Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Mon, 13 Oct 2008 08:23:00 +0000 Subject: 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 --- lang/python30/files/patch-modules_stropmodule.c | 31 ------------------------- 1 file changed, 31 deletions(-) delete mode 100644 lang/python30/files/patch-modules_stropmodule.c (limited to 'lang/python30/files/patch-modules_stropmodule.c') diff --git a/lang/python30/files/patch-modules_stropmodule.c b/lang/python30/files/patch-modules_stropmodule.c deleted file mode 100644 index d7f42ce18871..000000000000 --- a/lang/python30/files/patch-modules_stropmodule.c +++ /dev/null @@ -1,31 +0,0 @@ ---- Modules/stropmodule.c.orig 2008-02-14 11:26:18.000000000 +0000 -+++ Modules/stropmodule.c 2008-08-30 10:16:13.000000000 +0100 -@@ -216,6 +216,13 @@ - return NULL; - } - slen = PyString_GET_SIZE(item); -+ if (slen > PY_SSIZE_T_MAX - reslen || -+ seplen > PY_SSIZE_T_MAX - reslen - seplen) { -+ PyErr_SetString(PyExc_OverflowError, -+ "input too long"); -+ Py_DECREF(res); -+ return NULL; -+ } - while (reslen + slen + seplen >= sz) { - if (_PyString_Resize(&res, sz * 2) < 0) - return NULL; -@@ -253,6 +260,14 @@ - return NULL; - } - slen = PyString_GET_SIZE(item); -+ if (slen > PY_SSIZE_T_MAX - reslen || -+ seplen > PY_SSIZE_T_MAX - reslen - seplen) { -+ PyErr_SetString(PyExc_OverflowError, -+ "input too long"); -+ Py_DECREF(res); -+ Py_XDECREF(item); -+ return NULL; -+ } - while (reslen + slen + seplen >= sz) { - if (_PyString_Resize(&res, sz * 2) < 0) { - Py_DECREF(item); -- cgit v1.2.3