summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-10-15 15:51:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-10-15 15:51:17 (GMT)
commit315aa404030f425a8bf7fdb5a5275c118555bc37 (patch)
tree74ad4e2f1fecfc5dda2399ea2572bfd3e5fe3f0a /Objects
parent69252643344ae4e80b4582ec6472401d59b3540b (diff)
parent60d7a731940d978cc152181507522f6b90240f97 (diff)
downloadcpython-315aa404030f425a8bf7fdb5a5275c118555bc37.zip
cpython-315aa404030f425a8bf7fdb5a5275c118555bc37.tar.gz
cpython-315aa404030f425a8bf7fdb5a5275c118555bc37.tar.bz2
Merge 3.4
Diffstat (limited to 'Objects')
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 4a69e66..208fe80 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9680,7 +9680,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);