[Python-checkins] cpython (merge 3.3 -> 3.4): Merge 3.3

[benjamin.peterson]

https://hg.python.org/cpython/rev/a6d0b1275d4b
changeset: 93072:a6d0b1275d4b
branch: 3.4
parent: 93069:570e70252d5d
parent: 93071:6a91e616485a
user: Benjamin Peterson <benjamin at python.org>
date: Wed Oct 15 11:51:12 2014 -0400
summary:
Merge 3.3

files:
Objects/unicodeobject.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9656,7 +9656,7 @@
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);

[benjamin.peterson]

https://hg.python.org/cpython/rev/2f90ea9e60ef
changeset: 93092:2f90ea9e60ef
branch: 3.4
parent: 93089:dd3c0ea52106
parent: 93091:b4a6be12a4bc
user: Benjamin Peterson <benjamin at python.org>
date: Wed Oct 15 23:58:32 2014 -0400
summary:
Merge 3.3

files:
Objects/unicodeobject.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9651,7 +9651,7 @@
kind = PyUnicode_KIND(self);
data = PyUnicode_DATA(self);
length = PyUnicode_GET_LENGTH(self);
- if (length > PY_SSIZE_T_MAX / (3 * sizeof(Py_UCS4))) {
+ if ((size_t) length > PY_SSIZE_T_MAX / (3 * sizeof(Py_UCS4))) {
PyErr_SetString(PyExc_OverflowError, "string is too long");
return NULL;
}