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

[benjamin.peterson]

https://hg.python.org/cpython/rev/2a25076c50ad
changeset:   93075:2a25076c50ad
branch:      3.4
parent:      93072:a6d0b1275d4b
parent:      93074:f963cc1f96cf
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Oct 15 12:17:33 2014 -0400
summary:
  merge 3.3

files:
  Objects/unicodeobject.c |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9651,12 +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))) {
+    if (length > PY_SSIZE_T_MAX / (3 * sizeof(Py_UCS4))) {
         PyErr_SetString(PyExc_OverflowError, "string is too long");
         return NULL;
     }
-    tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * (size_t)length);
+    tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * length);
     if (tmp == NULL)
         return PyErr_NoMemory();
     newlength = perform(kind, data, length, tmp, &maxchar);

-- 
Repository URL: https://hg.python.org/cpython