diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-10-15 15:48:41 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-10-15 15:48:41 (GMT) |
| commit | 1cbb3fe775c210459f53386b8172f5f2965ee33b (patch) | |
| tree | 718e76fe1cc9af45ccae267245787fce8fc913ce /Objects | |
| parent | fd39a89e0e09de5460626a68e9e443fe0c103c14 (diff) | |
| parent | e1bd38c03c16cd27227b3148d2be0ef1ab678448 (diff) | |
| download | cpython-1cbb3fe775c210459f53386b8172f5f2965ee33b.zip cpython-1cbb3fe775c210459f53386b8172f5f2965ee33b.tar.gz cpython-1cbb3fe775c210459f53386b8172f5f2965ee33b.tar.bz2 | |
merge 3.3 (#22643)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index c3f75fd..3132fd4 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9651,6 +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))) { + PyErr_SetString(PyExc_OverflowError, "string is too long"); + return NULL; + } tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * length); if (tmp == NULL) return PyErr_NoMemory(); |