[Python-checkins] cpython (3.3): Issue #22518: Fixed integer overflow issues in "backslashreplace",
georg.brandl
python-checkins at python.org
Sat Oct 4 15:09:55 CEST 2014
https://hg.python.org/cpython/rev/51317c9786f5
changeset: 92805:51317c9786f5
branch: 3.3
tag: v3.3.6rc1
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sat Oct 04 14:15:49 2014 +0300
summary:
Issue #22518: Fixed integer overflow issues in "backslashreplace",
"xmlcharrefreplace", and "surrogatepass" error handlers.
files:
Misc/NEWS | 3 +++
Python/codecs.c | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #22518: Fixed integer overflow issues in "backslashreplace",
+ "xmlcharrefreplace", and "surrogatepass" error handlers.
+
- Issue #22520: Fix overflow checking when generating the repr of a unicode
object.
diff --git a/Python/codecs.c b/Python/codecs.c
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -727,7 +727,7 @@
Py_ssize_t end;
PyObject *res;
unsigned char *outp;
- int ressize;
+ Py_ssize_t ressize;
Py_UCS4 ch;
if (PyUnicodeEncodeError_GetStart(exc, &start))
return NULL;
@@ -735,6 +735,8 @@
return NULL;
if (!(object = PyUnicodeEncodeError_GetObject(exc)))
return NULL;
+ if (end - start > PY_SSIZE_T_MAX / (2+7+1))
+ end = start + PY_SSIZE_T_MAX / (2+7+1);
for (i = start, ressize = 0; i < end; ++i) {
/* object is guaranteed to be "ready" */
ch = PyUnicode_READ_CHAR(object, i);
@@ -823,7 +825,7 @@
Py_ssize_t end;
PyObject *res;
unsigned char *outp;
- int ressize;
+ Py_ssize_t ressize;
Py_UCS4 c;
if (PyUnicodeEncodeError_GetStart(exc, &start))
return NULL;
@@ -831,6 +833,8 @@
return NULL;
if (!(object = PyUnicodeEncodeError_GetObject(exc)))
return NULL;
+ if (end - start > PY_SSIZE_T_MAX / (1+1+8))
+ end = start + PY_SSIZE_T_MAX / (1+1+8);
for (i = start, ressize = 0; i < end; ++i) {
/* object is guaranteed to be "ready" */
c = PyUnicode_READ_CHAR(object, i);
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list