Merge 3.3

benjaminp · benjaminp · commit fc1d6320aef7 · 2014-10-15T11:51:12.000-04:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -9656,7 +9656,7 @@ case_operation(PyObject *self,`
`9656`	`9656`	`PyErr_SetString(PyExc_OverflowError, "string is too long");`
`9657`	`9657`	`return NULL;`
`9658`	`9658`	`}`
`9659`		`- tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * length);`
	`9659`	`+ tmp = PyMem_MALLOC(sizeof(Py_UCS4) * 3 * (size_t)length);`
`9660`	`9660`	`if (tmp == NULL)`
`9661`	`9661`	`return PyErr_NoMemory();`
`9662`	`9662`	`newlength = perform(kind, data, length, tmp, &maxchar);`