[Python-checkins] cpython (merge 3.3 -> 3.4): merge 3.3 (#22643)

[benjamin.peterson]

https://hg.python.org/cpython/rev/570e70252d5d
changeset: 93069:570e70252d5d
branch: 3.4
parent: 93066:c2ccbcd11d47
parent: 93068:449b1f427cc7
user: Benjamin Peterson <benjamin at python.org>
date: Wed Oct 15 11:48:41 2014 -0400
summary:
merge 3.3 (#22643)

files:
Lib/test/test_unicode.py | 5 +++++
Misc/NEWS | 3 +++
Objects/unicodeobject.c | 5 +++++
3 files changed, 13 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -672,6 +672,11 @@
self.assertEqual('x'.center(4, '\U0010FFFF'),
'\U0010FFFFx\U0010FFFF\U0010FFFF')

+ @unittest.skipUnless(sys.maxsize == 2**31 - 1, "requires 32-bit system")
+ def test_case_operation_overflow(self):
+ # Issue #22643
+ self.assertRaises(OverflowError, ("?"*(2**32//12 + 1)).upper)
+
def test_contains(self):
# Testing Unicode contains method
self.assertIn('a', 'abdb')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -11,6 +11,9 @@
Core and Builtins
-----------------

+- Issue #22643: Fix integer overflow in Unicode case operations (upper, lower,
+ title, swapcase, casefold).
+
- Issue #22604: Fix assertion error in debug mode when dividing a complex
number by (nan+0j).

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9651,6 +9651,11 @@
kind = PyUnicode_KIND(self);
data = PyUnicode_DATA(self);
length = PyUnicode_GET_LENGTH(self);
+ if (length > PY_SSIZE_T_MAX / 3 ||
+ length > PY_SIZE_MAX / (3 * sizeof(Py_UCS4))) {
+ PyErr_SetString(PyExc_OverflowError, "string is too long");
+ return NULL;
+ }
tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * length);
if (tmp == NULL)
return PyErr_NoMemory();

[benjamin.peterson]

https://hg.python.org/cpython/rev/33290d0dd946
changeset: 93080:33290d0dd946
branch: 3.4
parent: 93075:2a25076c50ad
parent: 93079:cda907a02a80
user: Benjamin Peterson <benjamin at python.org>
date: Wed Oct 15 13:40:01 2014 -0400
summary:
merge 3.3 (#22643)

files:
Lib/test/test_unicode.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -673,6 +673,7 @@
'\U0010FFFFx\U0010FFFF\U0010FFFF')

@unittest.skipUnless(sys.maxsize == 2**31 - 1, "requires 32-bit system")
+ @support.cpython_only
def test_case_operation_overflow(self):
# Issue #22643
self.assertRaises(OverflowError, ("?"*(2**32//12 + 1)).upper)