summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-10-15 15:51:12 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-10-15 15:51:12 (GMT)
commit60d7a731940d978cc152181507522f6b90240f97 (patch)
tree4f6723f023ddb1cf2559671e58fc4aa8757b5628
parent1cbb3fe775c210459f53386b8172f5f2965ee33b (diff)
parentc0e64f5027a2d07976027447b6d1ef464a2dc158 (diff)
downloadcpython-60d7a731940d978cc152181507522f6b90240f97.zip
cpython-60d7a731940d978cc152181507522f6b90240f97.tar.gz
cpython-60d7a731940d978cc152181507522f6b90240f97.tar.bz2
Merge 3.3
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 3132fd4..87df740 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -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);