merge 3.3

benjaminp · benjaminp · commit 9c422f3c3d04 · 2014-10-15T12:17:33.000-04:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -9651,12 +9651,11 @@ case_operation(PyObject *self,
     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);
