Merge 3.3

This commit is contained in:
Benjamin Peterson 2014-10-15 11:51:12 -04:00
commit 60d7a73194

View file

@ -9656,7 +9656,7 @@ case_operation(PyObject *self,
PyErr_SetString(PyExc_OverflowError, "string is too long");
return NULL;
}
tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * length);
tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * (size_t)length);
if (tmp == NULL)
return PyErr_NoMemory();
newlength = perform(kind, data, length, tmp, &maxchar);